merging in remote and recompiling

diff --cc bootstrap-1.2.0.css
index 4b7da600327bbda26686cde26d74bdd5161014a0,98f1b20db3dd93a81f84cc65f90b50b810702c60..b10c09558be85af93f7d36d4ec22db78e5440b21
--- 1/bootstrap-1.1.1.css
--- 2/bootstrap-1.2.0.css
+++ b/bootstrap-1.2.0.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: Tue Aug 30 08:27:42 PDT 2011
 - * Date: Wed Aug 31 10:55:48 PDT 2011
++ * Date: Wed Aug 31 16:27:14 PDT 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).

diff --cc bootstrap-1.2.0.min.css
Simple merge

diff --cc docs/index.html
Simple merge

diff --cc lib/scaffolding.less
Simple merge