Merge branch 'master' of http://git.local.twitter.com/bootstrap

diff --cc bootstrap-1.0.0.css
index b8755a33d47d7b405589f129cda3afc50ca6742a,e33fef2bd33b694689f3e0c392361a6a588b83c8..abd31f47a55c7643e142c0f2f0289d150c224973
--- 1/bootstrap-1.0.0.css
--- 2/bootstrap-1.0.0.css
+++ b/bootstrap-1.0.0.css
@@@ -429,10 -413,8 +413,8 @@@ p 
  }
  p small {
    font-size: 12px;
 -  color: #b3b3b3;
 +  color: #bfbfbf;
  }
- /* Headings
- -------------------------------------------------- */
  h1,
  h2,
  h3,
@@@ -488,11 -470,9 +470,9 @@@ h5 
  }
  h6 {
    font-size: 13px;
 -  color: #b3b3b3;
 +  color: #bfbfbf;
    text-transform: uppercase;
  }
- /* Colors
- -------------------------------------------------- */
  ul, ol {
    margin: 0 0 18px 25px;
  }

diff --cc lib/patterns.less
Simple merge

diff --cc lib/preboot.less
Simple merge

diff --cc lib/type.less
index 22eb4778000077f5a77ca15798bd74efa0a6400a,e19c51ab91834f0d0cccef4efca3c5afce4ef5ff..cc18bff6024b2304f2438fe8ed9c0114a85dbef3
--- 1/lib/type.less
--- 2/lib/type.less
+++ b/lib/type.less
@@@ -16,12 -15,11 +15,11 @@@ p 
    }
  }
  
- 
- /* Headings
- -------------------------------------------------- */
+ // Headings
+ // --------
  
  h1, h2, h3, h4, h5, h6 {
 -  font-weight: 500;
 +  font-weight: bold;
    color: @grayDark;
    small {
      color: @grayLight;