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

Conflicts:
	bootstrap.css

diff --cc bootstrap.css
index 09b7b41821b848591c56f1940a38d352f5f9707a,561a705720e11a9ac585269502f28769900cef82..817a1ead28f8d2c19cf6dcb720f9bc14315c279e
--- 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 Jan 11 20:37:24 PST 2012
 - * Date: Tue Jan 10 21:52:26 PST 2012
++ * Date: Wed Jan 11 21:43:40 PST 2012
   */
  html, body {
    margin: 0;

diff --cc bootstrap.min.css
Simple merge

diff --cc docs/scaffolding.html
Simple merge