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

Makefile

@@ -16,6 +16,11 @@ docs:
 	cp img/* docs/assets/img/
 	cp js/*.js docs/assets/js/
 	cp js/tests/vendor/jquery.js docs/assets/js/
+	cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js > docs/assets/js/bootstrap.js
+	uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/js/bootstrap.min.tmp.js
+	echo "/**\n* Bootstrap.js by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js
+	cat docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js > docs/assets/js/bootstrap.min.js
+	rm docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js
 
 #
 # BUILD SIMPLE BOOTSTRAP DIRECTORY