Merge xpa (2.1.15-4) import into refs/heads/workingbranch
authorOle Streicher <olebole@debian.org>
Thu, 25 Sep 2014 10:21:34 +0000 (11:21 +0100)
committerOle Streicher <olebole@debian.org>
Thu, 25 Sep 2014 10:21:34 +0000 (11:21 +0100)

Trivial merge