Merge branch 'glk-074'
authorPhilip Chimento <philip.chimento@gmail.com>
Sun, 12 Feb 2012 12:58:18 +0000 (13:58 +0100)
committerPhilip Chimento <philip.chimento@gmail.com>
Sun, 12 Feb 2012 12:58:18 +0000 (13:58 +0100)

Trivial merge