Merge branch 'unstable'
authorsalimfadhley <sal@stodge.org>
Mon, 1 Jul 2013 23:55:26 +0000 (00:55 +0100)
committersalimfadhley <sal@stodge.org>
Mon, 1 Jul 2013 23:55:26 +0000 (00:55 +0100)

Trivial merge