merge in master after merging a pull request, add comment

diff --cc bootstrap-1.2.0.css
index 70807098591579ffe3c4de3a441e4a9c27e8ead0,2fd6680fd321ae977c1508f745e5463a42c39cc3..7bd2e06a1b65edab48e1a3334d46875c7014d95e
--- 1/bootstrap-1.2.0.css
--- 2/bootstrap-1.1.1.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 09:48:25 PDT 2011
 - * Date: Fri Sep  2 12:48:19 EDT 2011
++ * Date: Fri Sep  2 09:52:17 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
index ada6fc04d71dc9092aefcb055d8f12fbcc1d2231,fb05d053bd8d777d6491f867c8a02cd90b928fff..7769c7a8cf380241397d04671fd4eac363d9c97c
--- 1/bootstrap-1.2.0.min.css
--- 2/bootstrap-1.1.1.min.css
+++ b/bootstrap-1.2.0.min.css
@@@ -68,9 -65,18 +68,9 @@@ body{margin:0;font-family:"Helvetica Ne
  .container{width:940px;margin:0 auto;}
  .container-fluid{padding:0 20px;zoom:1;margin-bottom:18px;}.container-fluid:before,.container-fluid:after{display:table;content:"";}
  .container-fluid:after{clear:both;}
- .container-fluid .sidebar{float:left;width:220px;}
- .container-fluid .content{min-width:700px;max-width:1180px;margin-left:240px;}
+ .container-fluid>.sidebar{float:left;width:220px;}
+ .container-fluid>.content{min-width:700px;max-width:1180px;margin-left:240px;}
  a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:hover{color:#0050a3;text-decoration:underline;}
 -.btn{display:inline-block;background-color:#e6e6e6;background-repeat:no-repeat;background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), color-stop(0.25, #ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-moz-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-ms-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:-o-linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);background-image:linear-gradient(#ffffff, #ffffff 0.25, #e6e6e6);padding:4px 14px;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);color:#333;font-size:13px;line-height:18px;border:1px solid #ccc;border-bottom-color:#bbb;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);}.btn:hover{background-position:0 -15px;color:#333;text-decoration:none;}
 -.primary{background-color:#0064cd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#049cdb), to(#0064cd));background-image:-moz-linear-gradient(top, #049cdb, #0064cd);background-image:-ms-linear-gradient(top, #049cdb, #0064cd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #049cdb), color-stop(100%, #0064cd));background-image:-webkit-linear-gradient(top, #049cdb, #0064cd);background-image:-o-linear-gradient(top, #049cdb, #0064cd);background-image:linear-gradient(top, #049cdb, #0064cd);color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border:1px solid #004b9a;border-bottom-color:#003f81;}.primary:hover{color:#fff;}
 -.btn{-webkit-transition:0.1s linear all;-moz-transition:0.1s linear all;transition:0.1s linear all;}.btn.primary{color:#fff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#0064cd #0064cd #003f81;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}.btn.primary:hover{color:#fff;}
 -.btn.large{font-size:16px;line-height:28px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}
 -.btn.small{padding-right:9px;padding-left:9px;font-size:11px;}
 -.btn.disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 -.btn:disabled{background-image:none;filter:alpha(opacity=65);-khtml-opacity:0.65;-moz-opacity:0.65;opacity:0.65;cursor:default;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.btn:disabled.primary{color:#fff;}
 -.btn:active{-webkit-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 3px 7px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);}
 -button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;}
  p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:9px;}p small{font-size:11px;color:#bfbfbf;}
  h1,h2,h3,h4,h5,h6{font-weight:bold;color:#404040;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#bfbfbf;}
  h1{margin-bottom:18px;font-size:30px;line-height:36px;}h1 small{font-size:18px;}

diff --cc lib/scaffolding.less
index b84b43721388ca8baa73f803740d69a1354e8115,5863659c2c6915743ceae4da0d76522966f03207..615e6be78d2c58a40b84b51ff19dc1de390e7265
--- 1/lib/scaffolding.less
--- 2/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@@ -85,7 -94,7 +85,8 @@@ body 
      float: left;
      width: 220px;
    }
-   .content {
++  // TODO in v2: rename this and .popover .content to be more specific
+   > .content {
      min-width: 700px;
      max-width: 1180px;
      margin-left: 240px;
@@@ -106,4 -115,90 +107,4 @@@ a 
      color: @linkColorHover;
      text-decoration: underline;
    }
- }
+ }
 -
 -// Buttons
 -.btn {
 -  display: inline-block;
 -  #gradient > .vertical-three-colors(#fff, #fff, 0.25, darken(#fff, 10%));
 -  padding: 4px 14px;
 -  text-shadow: 0 1px 1px rgba(255,255,255,.75);
 -  color: #333;
 -  font-size: 13px;
 -  line-height: @baseline;
 -  border: 1px solid #ccc;
 -  border-bottom-color: #bbb;
 -  .border-radius(4px);
 -  @shadow: inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05);
 -  .box-shadow(@shadow);
 -  &:hover {
 -    background-position: 0 -15px;
 -    color: #333;
 -    text-decoration: none;
 -  }
 -}
 -.primary {
 -  #gradient > .vertical(#049CDB, #0064CD);
 -  color: #fff;
 -  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
 -  border: 1px solid darken(#0064CD, 10%);
 -  border-bottom-color: darken(#0064CD, 15%);
 -  &:hover {
 -    color: #fff;
 -  }
 -}
 -
 -.btn {
 -  //.button(#1174C6);
 -  .transition(.1s linear all);
 -  &.primary {
 -    //#gradient > .vertical(@blue, @blueDark);
 -    color: #fff;
 -    text-shadow: 0 -1px 0 rgba(0,0,0,.25);
 -    border-color: @blueDark @blueDark darken(@blueDark, 15%);
 -    border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fadein(rgba(0,0,0,.1), 15%);
 -    &:hover {
 -      color: #fff;
 -    }
 -  }
 -  &.large {
 -    font-size: 16px;
 -    line-height: 28px;
 -    .border-radius(6px);
 -  }
 -  &.small {
 -    padding-right: 9px;
 -    padding-left: 9px;
 -    font-size: 11px;
 -  }
 -  &.disabled {
 -    background-image: none;
 -    .opacity(65);
 -    cursor: default;
 -    .box-shadow(none);
 -  }
 -
 -  // this can't be included with the .disabled def because IE8 and below will drop it ;_;
 -  &:disabled {
 -    background-image: none;
 -    .opacity(65);
 -    cursor: default;
 -    .box-shadow(none);
 -    &.primary {
 -      color: #fff;
 -    }
 -  }
 -  &:active {
 -    @shadow: inset 0 3px 7px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05);
 -    .box-shadow(@shadow);
 -  }
 -}
 -
 -// Help Firefox not be a jerk about adding extra padding to buttons
 -button.btn,
 -input[type=submit].btn {
 -  &::-moz-focus-inner {
 -      padding: 0;
 -      border: 0;
 -  }
 -}