The following commit has been merged in the master branch:
commit ca4fd64b6c9d8cd7eae24f702cc4376ac69feccd
Merge: 4e0425226a8aa00d755c968f0be930bfadf0f318 4a060e7cd5234b7e8ee9e796bb857f154ca038d4
Author: gregor herrmann <gregoa at debian.org>
Date: Fri Sep 23 22:14:32 2011 +0200
Merge commit 'upstream/0.45'
--