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

Conflicts:
	bootstrap.css

diff --cc bootstrap.css
index d0c78d03706be6e83506379cf1085ea41325cef3,afd87d1372665cc0006c8e4ebaec723e1f7653c0..adae67ec911c9f526261aba6da265515a5d6a111
--- 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: Fri Dec  9 11:23:25 PST 2011
 - * Date: Wed Nov 30 22:05:44 PST 2011
++ * Date: Fri Dec  9 11:32:45 PST 2011
   */
  html, body {
    margin: 0;