Merge branch 'misc_css_fixes' of github.com:twitter/bootstrap into misc_css_fixes

Conflicts:
	lib/forms.less

diff --cc lib/forms.less
index 6e440feaea4e82809ac83bf188aa43a5f92c62ae,3a847ae841488752a846e3c2ef86fe239ef2edd5..590326034099b810faa0dd20db8eec8175a4b8a6
--- 1/lib/forms.less
--- 2/lib/forms.less
+++ b/lib/forms.less
@@@ -261,14 -257,7 +261,14 @@@ form 
      border-color: @green;
    }
  }
- div.input-prepend {
 +
- div.input-append {
++.input-prepend {
 +  .add-on {
 +    *margin-top: 1px; /* IE6-7 */
 +  }
 +}
 +
+ .input-append {
    input[type=text] {
      float: left;
      .border-radius(3px 0 0 3px);