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

Conflicts:
	bootstrap.css

diff --cc bootstrap.css
index 39add869608310169261b4e922aac557c4db7ed6,e548f5afc666eade15c43344f62ff0d329ecf893..730167f51f301b93b35646e2e84fa4bdd13a4e9c
--- 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 25 11:24:56 PST 2012
 - * Date: Wed Jan 25 11:23:36 PST 2012
++ * Date: Wed Jan 25 11:27:15 PST 2012
   */
  article,
  aside,

diff --cc docs/base-css.html
Simple merge