Merge branch 'master' of https://wamblee.org/git/public/utils
authorErik Brakkee <erik@brakkee.org>
Sat, 22 Dec 2012 17:39:49 +0000 (18:39 +0100)
committerErik Brakkee <erik@brakkee.org>
Sat, 22 Dec 2012 17:39:49 +0000 (18:39 +0100)

Trivial merge