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

Conflicts:
	bootstrap.css

diff --cc bootstrap.css
index c53264a2d62ee6da3fdfa7635818ace43a5a59e3,b9cd608ae4a23d68e7d230d953b13b9a74717565..931d0c017928b8fb97b6fd81a4529b57c45e94c4
--- 1/bootstrap.css
--- 2/bootstrap.css
+++ b/bootstrap.css
@@@ -6,7 -6,7 +6,11 @@@
   * http://www.apache.org/licenses/LICENSE-2.0
   *
   * Designed and built with all the love in the world @twitter by @mdo and @fat.
++<<<<<<< HEAD
 + * Date: Wed Jan 25 12:03:47 PST 2012
++=======
+  * Date: Wed Jan 25 11:49:21 PST 2012
++>>>>>>> 04f84997c18f2f132c8173f728f72b6b7aef52d1
   */
  article,
  aside,

diff --cc bootstrap.min.css
Simple merge