Merge branch 'master' of https://github.com/mpeltonen/jenkins

And fix my previous bad push.
I apologize folks !! my bad :-(

Conflicts:
	changelog.html
	test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java