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

Conflicts:
	bootstrap.css
	bootstrap.min.css

diff --cc bootstrap.css
index 7d6263c6bd87ae5c444cb4f1a2563ec659feeb55,2881afefde337c967240608cb250db2cc5fe99ad..a46f6ca85a4a2712555111d866e174474cf9a610
--- 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: Sat Jan  7 23:50:13 PST 2012
 - * Date: Sat Jan  7 23:30:30 PST 2012
++ * Date: Sun Jan  8 00:50:20 PST 2012
   */
  html, body {
    margin: 0;