Merge branch 'release-5.17.3' into blead
authorSteve Hay <steve.m.hay@googlemail.com>
Mon, 20 Aug 2012 14:31:24 +0000 (15:31 +0100)
committerSteve Hay <steve.m.hay@googlemail.com>
Mon, 20 Aug 2012 14:31:24 +0000 (15:31 +0100)

Trivial merge