Merge branch 'unstable'
authorSalim Fadhley <sal@stodge.org>
Sun, 30 Jun 2013 01:04:18 +0000 (02:04 +0100)
committerSalim Fadhley <sal@stodge.org>
Sun, 30 Jun 2013 01:04:18 +0000 (02:04 +0100)

Trivial merge