Merge commit 'vanilla/master' into refs/top-bases/t/config/homepage
commit19d9fef7cb290834d2731a096b9e9181e8418bb6
authorPetr Baudis <pasky@ucw.cz>
Mon, 2 Nov 2009 23:45:01 +0000 (3 00:45 +0100)
committerPetr Baudis <pasky@rover.dkm.cz>
Mon, 2 Nov 2009 23:45:01 +0000 (3 00:45 +0100)
treedc11cab537d3080d225ade1a75bcad1150104ebd
parent840c566f5fcd627c605f761762b94c3199609bac
parent8cc62c1677c99c5e204d2b51269b47b7557a79e0
Merge commit 'vanilla/master' into refs/top-bases/t/config/homepage