Merge commit 'da609f721e54691f27113e877a19637bd332abc3' into less-critical
authorDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 23 Jan 2013 21:57:30 +0000 (22:57 +0100)
committerDavid ‘Bombe’ Roden <bombe@pterodactylus.net>
Wed, 23 Jan 2013 21:57:30 +0000 (22:57 +0100)

Trivial merge