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

Conflicts:
	docs/assets/bootstrap.zip

diff --cc docs/assets/bootstrap.zip
index ca6b71417ade9298374184e4866fed96ad9b7826,1636eb0628f37334b662602528597bb434be6397..d17012d706b95af27330d51b13707bd8454c86f4
Binary files differ

diff --cc docs/assets/css/bootstrap.css
index 15d7c0d07014eec6e3a8ee55c6f03824dfd49a29,03a165545ddcd10c8a074076285df325720dbf05..00baa1a5f9cb77c7ef32280b78153fbd3414aa2f
--- 1/docs/assets/css/bootstrap.css
--- 2/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@@ -2337,11 -2434,12 +2451,12 @@@ input[type="submit"].btn.btn-small 
    margin-top: 9px;
  }
  .nav-list {
 -  padding-left: 14px;
 -  padding-right: 14px;
 +  padding-left: 15px;
 +  padding-right: 15px;
    margin-bottom: 0;
  }
- .nav-list > li > a, .nav-list .nav-header {
+ .nav-list > li > a,
+ .nav-list .nav-header {
    margin-left: -15px;
    margin-right: -15px;
    text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);