Merge commit 'refs/top-bases/master'master
authorPetr Baudis <pasky@ucw.cz>
Fri, 6 Nov 2009 14:29:51 +0000 (6 15:29 +0100)
committerPetr Baudis <pasky@rover.dkm.cz>
Fri, 6 Nov 2009 14:29:51 +0000 (6 15:29 +0100)

Trivial merge