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

Conflicts:
	docs/assets/css/bootstrap.css

diff --cc docs/assets/css/bootstrap.css
index 0783aa7ee47ed490a54584797b7dff6f07ea1175,db6df3a19888765613fb9859bfdb01d1826396fc..8cf855b8b0e32b5b4b5678b545b5e8f41333803b
--- 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:38:50 PST 2012
 - * Date: Fri Jan 27 13:37:10 PST 2012
++ * Date: Fri Jan 27 13:43:19 PST 2012
   */
  article,
  aside,

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