Merge branch 'unstable'
authorSalim Fadhley <sal@stodge.org>
Sat, 29 Jun 2013 23:24:32 +0000 (00:24 +0100)
committerSalim Fadhley <sal@stodge.org>
Sat, 29 Jun 2013 23:24:32 +0000 (00:24 +0100)

Trivial merge