Merge branch 'master' into graceful_stop
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 18 Apr 2012 11:57:31 +0000 (13:57 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 18 Apr 2012 11:57:31 +0000 (13:57 +0200)

Trivial merge