Merge branch 'bingos/release-5.15.7' into blead
authorChris 'BinGOs' Williams <chris@bingosnet.co.uk>
Fri, 20 Jan 2012 20:02:55 +0000 (20:02 +0000)
committerChris 'BinGOs' Williams <chris@bingosnet.co.uk>
Fri, 20 Jan 2012 20:02:55 +0000 (20:02 +0000)

Trivial merge