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

Conflicts:
	docs/assets/css/bootstrap.css

diff --cc docs/assets/css/bootstrap.css
index b365ad0f437aa8196464dace6fcd534163f6c9e8,9c8aaee5a54ede0e5c03102fe5347648397c9ab3..db6df3a19888765613fb9859bfdb01d1826396fc
--- 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:34:19 PST 2012
 - * Date: Fri Jan 27 13:35:54 PST 2012
++ * Date: Fri Jan 27 13:37:10 PST 2012
   */
  article,
  aside,

diff --cc docs/download.html
Simple merge