Merge branch 'master' into snapshotserver
authorRichard Fairhurst <richard@systemeD.net>
Sat, 8 Oct 2011 08:43:39 +0000 (09:43 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Sat, 8 Oct 2011 08:43:39 +0000 (09:43 +0100)

Trivial merge