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

Conflicts:
	bootstrap.css

docs/assets/css/docs.css

@@ -22,6 +22,7 @@ body {
 body > .navbar-fixed .brand {
   padding-right: 0;
   padding-left: 0;
+  margin-left: 20px;
   float: right;
   font-weight: bold;
   color: #000;

docs/base-css.html

@@ -646,25 +646,24 @@
       <tr>
         <td>1</td>
         <td colspan="2">Some One</td>
-        <td>English</td>
+        <td>HTML</td>
       </tr>
       <tr>
         <td>2</td>
         <td>Joe</td>
         <td>Sixpack</td>
-        <td>English</td>
+        <td rowspan="2">Javascript</td>
       </tr>
       </tr>
         <td>3</td>
         <td>Joe</td>
         <td>Sixpack</td>
-        <td>English</td>
       </tr>
       <tr>
         <td>3</td>
         <td>Stu</td>
         <td>Dent</td>
-        <td>Code</td>
+        <td>CSS</td>
       </tr>
     </tbody>
   </table>
@@ -894,7 +893,17 @@ Form states
               <span class="add-on">@</span>
               <input class="input-small" id="prependedInput" name="prependedInput" size="16" type="text">
             </div>
-            <span class="help-block">Here's some help text</span>
+            <p class="help-block">Here's some help text</p>
+          </div>
+        </fieldset>
+        <fieldset class="control-group">
+          <label class="control-label" for="appendedInput">Appended text</label>
+          <div class="controls">
+            <div class="input-append">
+              <input class="input-small" id="appendedInput" name="appendedInput" size="16" type="text">
+              <span class="add-on">.00</span>
+            </div>
+            <p class="help-block">Here's more help text</p>
           </div>
         </fieldset>
         <fieldset class="control-group">

docs/components.html

@@ -716,7 +716,7 @@
       <p><a class="btn js-btn" href="./javascript.html#modal">Get the javascript &raquo;</a></p>
     </div>
     <div class="span9">
-      <div class="well" style="background-color: #888; border: none; padding: 40px;">
+      <div class="well" style="background-color: #888; border: none; ">
         <!-- Modal -->
         <div class="modal" style="position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1">
           <div class="modal-header">