Merge remote-tracking branch 'maja/master'
authorLinus Nordberg <linus@nordu.net>
Thu, 22 Dec 2011 09:04:24 +0000 (10:04 +0100)
committerLinus Nordberg <linus@nordu.net>
Thu, 22 Dec 2011 09:04:24 +0000 (10:04 +0100)

Trivial merge