Merge branch 'master' of https://github.com/twitter/bootstrap

Conflicts:
	bootstrap.css

diff --cc bootstrap.css
index 91216cc32d52bed933accce52bc3b1b3201aa9a4,75780fccc1e05527461f4f4359db6006b71517fd..e9f2a38228578ac951f6f777ca3549aa7d6f6748
--- 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: Sat Nov 12 20:22:29 PST 2011
 - * Date: Sat Nov 12 01:04:51 PST 2011
++ * Date: Wed Nov 16 00:28:10 PST 2011
   */
  /* Reset.less
   * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here     that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).