Merge commit 'upstream/5.4.0_rc7' into debian-sid
authorOndřej Surý <ondrej@sury.org>
Fri, 17 Feb 2012 11:12:20 +0000 (12:12 +0100)
committerOndřej Surý <ondrej@sury.org>
Fri, 17 Feb 2012 11:12:20 +0000 (12:12 +0100)

Trivial merge