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

Conflicts:
	docs/assets/css/bootstrap.css
	docs/download.html

diff --cc docs/assets/css/bootstrap.css
index b772e8bbb5517aaf6da03488d7f346937d1afdac,b2284bc1640c488eb6205a6cdc76a01f7806bf4f..4f1e18ce993437fdf58244fdb61ad9f1b0ef1635
--- 1/docs/assets/css/bootstrap.css
--- 2/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/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 Jan 27 13:19:35 PST 2012
 - * Date: Fri Jan 27 11:07:13 PST 2012
++ * Date: Fri Jan 27 13:20:51 PST 2012
   */
  article,
  aside,

diff --cc docs/javascript.html
Simple merge