Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

Conflicts:
	bootstrap.css

diff --cc bootstrap.css
index 6ac110e29621193bd36f2294648c212e3de76f2f,817a1ead28f8d2c19cf6dcb720f9bc14315c279e..1250507b5edf11b8aa622eac1b0b2d5e02f228fd
--- 1/bootstrap.css
--- 2/bootstrap.css
+++ b/bootstrap.css
@@@ -6,7 -6,7 +6,7 @@@
   * http://www.apache.org/licenses/LICENSE-2.0
   *
   * Designed and built with all the love in the world @twitter by @mdo and @fat.
-  * Date: Wed Jan 11 09:43:04 PST 2012
 - * Date: Wed Jan 11 21:43:40 PST 2012
++ * Date: Wed Jan 11 21:59:22 PST 2012
   */
  html, body {
    margin: 0;

diff --cc bootstrap.min.css
Simple merge