Merge tag 'upstream/0.35'
authorAlexandre Mestiashvili <alex@biotec.tu-dresden.de>
Thu, 11 Apr 2013 12:53:20 +0000 (14:53 +0200)
committerAlexandre Mestiashvili <alex@biotec.tu-dresden.de>
Thu, 11 Apr 2013 12:53:20 +0000 (14:53 +0200)
Upstream version 0.35


Trivial merge