Merge branch 'master' into refs/top-bases/next
commitc0724867fd47b60f39267a045dc8a4e322e18f50
authorPetr Baudis <pasky@suse.cz>
Fri, 3 Oct 2008 15:03:48 +0000 (3 17:03 +0200)
committerPetr Baudis <pasky@suse.cz>
Fri, 3 Oct 2008 15:03:48 +0000 (3 17:03 +0200)
treed693fbc14ab06db4c69d2e1042f529a78af70d0f
parent723993850d595a80b14c2f13f0ac0638c366d70b
parent6e8a87e8c069c947fec12620d5eac19e3aad509f
Merge branch 'master' into refs/top-bases/next