Merge tag 'upstream/0.5.0+svn5194_dfsg1'
authorReinhard Tartler <siretart@tauware.de>
Sun, 6 Apr 2014 15:35:59 +0000 (11:35 -0400)
committerReinhard Tartler <siretart@tauware.de>
Sun, 6 Apr 2014 15:35:59 +0000 (11:35 -0400)
Upstream version 0.5.0+svn5194~dfsg1


Trivial merge