Merge 'versioning' into 'trunk'
Luke Saunders [Tue, 15 Jul 2008 22:13:08 +0000 (22:13 +0000)]

Trivial merge