Merge commit 'vanilla/master' into refs/top-bases/t/extra-actions/log-consolidate
authorPetr Baudis <pasky@ucw.cz>
Mon, 2 Nov 2009 23:40:56 +0000 (3 00:40 +0100)
committerPetr Baudis <pasky@rover.dkm.cz>
Mon, 2 Nov 2009 23:40:56 +0000 (3 00:40 +0100)

Trivial merge