Merge commit 'refs/top-bases/master'
authorPetr Baudis <pasky@ucw.cz>
Mon, 2 Nov 2009 23:41:10 +0000 (3 00:41 +0100)
committerPetr Baudis <pasky@rover.dkm.cz>
Mon, 2 Nov 2009 23:41:10 +0000 (3 00:41 +0100)

Trivial merge