Merge branch 'master' into refs/top-bases/next
commite175c6b4230073ec591f18ebc83638b6099dabe4
authorPetr Baudis <pasky@suse.cz>
Sun, 12 Oct 2008 14:32:42 +0000 (12 16:32 +0200)
committerPetr Baudis <pasky@suse.cz>
Sun, 12 Oct 2008 14:32:42 +0000 (12 16:32 +0200)
treee6c441642cbc1a32bc2b9a8a33a91b5abd22b9a1
parent776ea80c4bfc6d637e79185952502efae97bdce8
parentda6da6fba46fb67540f61d92ba9008233305e8e9
Merge branch 'master' into refs/top-bases/next
Makefile