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

Conflicts:
	bootstrap.css
	docs/base-css.html
	docs/components.html
	docs/index.html
	docs/javascript.html
	docs/less.html
	docs/scaffolding.html

1 files changed, 1 insertions, 1 deletions

diff --git a/lib/thumbnails.less b/lib/thumbnails.less
index 4f9c5f76d..0ba749059 100644
--- a/lib/thumbnails.less
+++ b/lib/thumbnails.less
@@ -8,7 +8,7 @@
 }
 .thumbnails > li {
   float: left;
-  margin: 0 0 20px 20px;
+  margin: 0 0 @baseLineHeight 20px;
 }
 .thumbnail {
   display: block;