Merge git+ssh://git.asbjorn.biz/rapper
authoromegasteffy <omegasteffy@gmail.com>
Thu, 4 Nov 2010 20:55:14 +0000 (21:55 +0100)
committeromegasteffy <omegasteffy@gmail.com>
Thu, 4 Nov 2010 20:55:14 +0000 (21:55 +0100)

Trivial merge