Merge branch 'master' into dynconf2
authorLinus Nordberg <linus@nordu.net>
Thu, 12 Apr 2012 18:20:38 +0000 (20:20 +0200)
committerLinus Nordberg <linus@nordu.net>
Thu, 12 Apr 2012 18:20:38 +0000 (20:20 +0200)

Trivial merge