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

Conflicts:
	bootstrap.css

diff --cc bootstrap.css
index 462c254a8a758bafa9ef7378983de6d04246d721,2bef99e1a3fc46bb104807b68acc83b7c1be4184..afd87d1372665cc0006c8e4ebaec723e1f7653c0
--- 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: Mon Nov 28 11:50:42 PST 2011
 - * Date: Wed Nov 30 00:54:47 PST 2011
++ * Date: Wed Nov 30 22:05:44 PST 2011
   */
  html, body {
    margin: 0;