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)
commit92326e678a7496f6caecb027a51e8f8df2651e08
treee8e1ac88d91243e351e0a4ff4f9badfacf3bc7eb
parent569c6fa11d428530883836482129cc8998b70fc0
parent5292df2401c781de56fd04835c18e11162152626
Merge commit 'upstream/5.4.0_rc7' into debian-sid