Merge branch 'sepa-fixes'
authorMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 8 Sep 2011 15:55:38 +0000 (17:55 +0200)
committerMoritz Bunkus <m.bunkus@linet-services.de>
Thu, 8 Sep 2011 15:55:38 +0000 (17:55 +0200)

Trivial merge