Merge tag 'upstream/0.36'
authorAlexandre Mestiashvili <alex@biotec.tu-dresden.de>
Tue, 14 May 2013 11:40:51 +0000 (13:40 +0200)
committerAlexandre Mestiashvili <alex@biotec.tu-dresden.de>
Tue, 14 May 2013 11:40:51 +0000 (13:40 +0200)
Upstream version 0.36


Trivial merge