Merge branch 'js-examples' into 1.3-wip

Conflicts:
	bootstrap-1.2.0.css

diff --cc bootstrap-1.2.0.css
index 7a848a247cef5aa3f1e47d1092a1fc359482f36e,da9e1f2272be2b51093cd769475ff6c1ec6e47bd..6beafa28b1d0680bcf8da6cb6ae3592fc2adeefe
--- 1/bootstrap-1.2.0.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: Fri Sep  2 20:59:16 PDT 2011
 - * Date: Fri Sep  2 21:04:38 PDT 2011
++ * Date: Fri Sep  2 21:06:46 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 lib/preboot.less
Simple merge

diff --cc lib/scaffolding.less
Simple merge