Merge tag 'upstream/0.9.7'
authorSven Hoexter <sven@timegate.de>
Fri, 9 Mar 2012 18:37:32 +0000 (19:37 +0100)
committerSven Hoexter <sven@timegate.de>
Fri, 9 Mar 2012 18:37:32 +0000 (19:37 +0100)
Upstream version 0.9.7


Trivial merge