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 7765d7961ec93e99355f36fb920ca6eaef2c6d59,0a45b94a39248b7cc7c0f705ec42229040b8b1a6..39ac62f7ac606bc576587ea9cec7b5131627bfa7
--- 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 14:48:21 PST 2012
 - * Date: Fri Jan 27 14:44:44 PST 2012
++ * Date: Fri Jan 27 14:48:53 PST 2012
   */
  article,
  aside,