Merge commit 'vanilla/master' into refs/top-bases/t/config/homepage
commit28ccd078fd4c8558a7597eb5ec025ee5691ed855
authorPetr Baudis <pasky@suse.cz>
Sun, 12 Oct 2008 14:35:46 +0000 (12 16:35 +0200)
committerPetr Baudis <pasky@suse.cz>
Sun, 12 Oct 2008 14:35:46 +0000 (12 16:35 +0200)
tree51f6054ba2607442e30659f5326fd1596af78f42
parent0e1dd917bad6156aab1500536662194386ff8e15
parente782e12f89955dfb0be82098af3cfdd8dd0eaf80
Merge commit 'vanilla/master' into refs/top-bases/t/config/homepage