Merge branch 'master' of git+ssh://git.asbjorn.biz/rapper
authorAsbjørn Sloth Tønnesen <asbjorn@asbjorn.biz>
Thu, 4 Nov 2010 20:33:40 +0000 (20:33 +0000)
committerAsbjørn Sloth Tønnesen <asbjorn@asbjorn.biz>
Thu, 4 Nov 2010 20:33:40 +0000 (20:33 +0000)

Trivial merge