Merge remote branch 'upstream/master'

author simonbrandhof <simon.brandhof@gmail.com>

Fri, 10 Jun 2011 13:24:57 +0000 (15:24 +0200)

committer simonbrandhof <simon.brandhof@gmail.com>

Fri, 10 Jun 2011 13:24:57 +0000 (15:24 +0200)
author simonbrandhof <simon.brandhof@gmail.com>
Fri, 10 Jun 2011 13:24:57 +0000 (15:24 +0200)
committer simonbrandhof <simon.brandhof@gmail.com>
Fri, 10 Jun 2011 13:24:57 +0000 (15:24 +0200)
diff --cc sonar-batch/src/main/java/org/sonar/batch/bootstrap/BootstrapModule.java
Simple merge
author	simonbrandhof <simon.brandhof@gmail.com>
	Fri, 10 Jun 2011 13:24:57 +0000 (15:24 +0200)
committer	simonbrandhof <simon.brandhof@gmail.com>
	Fri, 10 Jun 2011 13:24:57 +0000 (15:24 +0200)