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

Conflicts:
	bootstrap.css

diff --cc bootstrap.css
index cadc4d2438076c016d3206af79960f392d0eab1f,b71432eb4bc3e6140f43e0869ecd958f762288bc..086537f5fd85db43035511920a4acafa882b64ef
--- 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: Thu Jan 26 16:26:33 PST 2012
 - * Date: Thu Jan 26 15:50:30 PST 2012
++ * Date: Thu Jan 26 16:30:52 PST 2012
   */
  article,
  aside,

diff --cc bootstrap.min.css
Simple merge