Merge branch 'master' into graceful_stop
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 25 Apr 2012 09:14:36 +0000 (11:14 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 25 Apr 2012 09:14:36 +0000 (11:14 +0200)

Trivial merge