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

Conflicts:
	bootstrap.css

diff --cc bootstrap.css
index ade32d9ba57dc1bb553d9f9b26d3b37321fd2843,5413144e9d5dd85d06f71969c5052e89b48feed5..f9f174c3d5c2a1791cff3ed7095628fe5a9f9241
--- 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: Thu Jan  5 01:33:17 PST 2012
 - * Date: Mon Jan  2 22:33:44 PST 2012
++ * Date: Thu Jan  5 01:36:56 PST 2012
   */
  html, body {
    margin: 0;

diff --cc bootstrap.min.css
Simple merge