Erlend Hamnaberg 0d8920aec4 Merge commit 'upstream/master'
Conflicts:
	imageio/imageio-reference/pom.xml
	imageio/imageio-thumbsdb/pom.xml
	servlet/pom.xml
2010-04-20 11:40:30 +02:00
..
2010-04-20 11:40:30 +02:00