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

Conflicts:
	bootstrap.css

diff --cc bootstrap.css
index 2ea7a8fbe387a979f090b9b44fda4ddfda22c3a3,333d6f04c0a0467af2921f2cc28a1a4a30b65e2c..5e22415ddd4c2bd2f6909e25141cc56d2fe829b4
--- 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 Dec 21 19:31:39 CST 2011
 - * Date: Sat Dec 24 22:30:43 PST 2011
++ * Date: Mon Dec 26 16:47:02 CST 2011
   */
  html, body {
    margin: 0;

diff --cc bootstrap.min.css
Simple merge