Updating stable branch
authorNeil Smith <neil.git@njae.me.uk>
Wed, 22 Jul 2009 13:27:00 +0000 (13:27 +0000)
committerNeil Smith <neil.git@njae.me.uk>
Wed, 22 Jul 2009 13:27:00 +0000 (13:27 +0000)

Trivial merge