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

Conflicts:
	bootstrap-1.2.0.css

lib/preboot.less

@@ -240,6 +240,7 @@
     background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+
     background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10
     background-image: linear-gradient(top, @startColor, @endColor); // The standard
+    filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE6 & IE7
   }
   .directional (@startColor: #555, @endColor: #333, @deg: 45deg) {
     background-color: @endColor;

lib/scaffolding.less

@@ -81,11 +81,11 @@ body {
 .container-fluid {
   padding: 0 20px;
   .clearfix();
-  .sidebar {
+  > .sidebar {
     float: left;
     width: 220px;
   }
-  .content {
+  > .content {
     min-width: 700px;
     max-width: 1180px;
     margin-left: 240px;
@@ -106,4 +106,4 @@ a {
     color: @linkColorHover;
     text-decoration: underline;
   }
-}
+}