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

Conflicts:
	README.md
	bootstrap-1.2.0.css

4 files changed, 10 insertions, 10 deletions

diff --git a/README.md b/README.md
index 76b6e4563..eaa6ca983 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ Releases will be numbered with the follow format:
 And constructed with the following guidelines:
 
 * Breaking backwards compatibility bumps the major
-* New additions without breaking backwards compatibility bumpbs the minor
+* New additions without breaking backwards compatibility bumps the minor
 * Bug fixes and misc changes bump the patch
 
 For more information on SemVer, please visit http://semver.org/.
diff --git a/bootstrap-1.2.0.css b/bootstrap-1.2.0.css
index afb6b584a..b1cc2f136 100644
--- a/bootstrap-1.2.0.css
+++ b/bootstrap-1.2.0.css
@@ -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 23:30:34 PDT 2011
+ * Date: Tue Aug 30 23:37:26 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 --git a/docs/index.html b/docs/index.html
index 9ec827fb1..889bc0437 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -656,9 +656,9 @@
             </div>
           </div><!-- /clearfix -->
           <div class="clearfix error">
-            <label for="xlInput">X-Large Input</label>
+            <label for="xlInput2">X-Large Input</label>
             <div class="input">
-              <input class="xlarge error" id="xlInput" name="xlInput" size="30" type="text" />
+              <input class="xlarge error" id="xlInput2" name="xlInput2" size="30" type="text" />
               <span class="help-inline">Small snippet of help text</span>
             </div>
           </div><!-- /clearfix -->
@@ -693,7 +693,7 @@
             </div>
           </div><!-- /clearfix -->
           <div class="clearfix">
-            <label for="xlInput">File Input</label>
+            <label for="fileInput">File Input</label>
             <div class="input">
               <input class="input-file" id="fileInput" name="fileInput" type="file" />
             </div>
@@ -796,9 +796,9 @@
         <fieldset>
           <legend>Example form legend</legend>
           <div class="clearfix">
-            <label for="xlInput">X-Large Input</label>
+            <label for="xlInput3">X-Large Input</label>
             <div class="input">
-              <input class="xlarge" id="xlInput" name="xlInput" size="30" type="text" />
+              <input class="xlarge" id="xlInput3" name="xlInput3" size="30" type="text" />
             </div>
           </div><!-- /clearfix -->
           <div class="clearfix">
@@ -817,9 +817,9 @@
         <fieldset>
           <legend>Example form legend</legend>
           <div class="clearfix error">
-            <label for="xlInput">X-Large Input</label>
+            <label for="xlInput4">X-Large Input</label>
             <div class="input">
-              <input class="xlarge error" id="xlInput" name="xlInput" size="30" type="text" />
+              <input class="xlarge error" id="xlInput4" name="xlInput4" size="30" type="text" />
               <span class="help-inline">Small snippet of help text</span>
             </div>
           </div><!-- /clearfix -->
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index c0272908f..a0dee789c 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -107,4 +107,4 @@ a {
     color: @linkColorHover;
     text-decoration: underline;
   }
-}
\ No newline at end of file
+}