Merge remote-tracking branch 'randomjunk/minor-updates'
authorRichard Fairhurst <richard@systemeD.net>
Sat, 2 Apr 2011 12:52:44 +0000 (13:52 +0100)
committerRichard Fairhurst <richard@systemeD.net>
Sat, 2 Apr 2011 12:52:44 +0000 (13:52 +0100)

Trivial merge