Merge tag 'upstream/0.37'
authorAlexandre Mestiashvili <alex@biotec.tu-dresden.de>
Mon, 16 Sep 2013 08:00:56 +0000 (10:00 +0200)
committerAlexandre Mestiashvili <alex@biotec.tu-dresden.de>
Mon, 16 Sep 2013 08:00:56 +0000 (10:00 +0200)
Upstream version 0.37


Trivial merge