Andrew Phillips c97a3e8cc5 Merge remote branch 'origin'
Conflicts:
	core/src/main/resources/rest.properties
	demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/config/SpringServletConfig.java
	rimuhosting/pom.xml
2010-11-08 11:08:50 +01:00
..
2010-08-31 14:22:35 -07:00
2010-08-12 16:04:26 -07:00