Merge 'trunk' into 'versioning'
Luke Saunders [Mon, 14 Jul 2008 12:11:13 +0000 (12:11 +0000)]
new branch


Trivial merge