Merge remote-tracking branch 'arkaria/master'
authorMagnus Hagander <magnus@hagander.net>
Wed, 3 Oct 2012 08:48:48 +0000 (10:48 +0200)
committerMagnus Hagander <magnus@hagander.net>
Wed, 3 Oct 2012 08:48:48 +0000 (10:48 +0200)

Trivial merge