Merge branch 'master' into refs/top-bases/next
commitbbd924f72ab46c5dd2f7714059f37b40ea380daf
authorPetr Baudis <pasky@suse.cz>
Mon, 1 Sep 2008 00:23:40 +0000 (1 02:23 +0200)
committerPetr Baudis <pasky@suse.cz>
Mon, 1 Sep 2008 00:23:40 +0000 (1 02:23 +0200)
treec4fce6bf2dce91cacdee6c67ad0d4fed73546db6
parent6a07c53d4056cc1f9a58ed976a0c28ff12f9a861
parent0e65a1b36f761303417b140c0b37c3489886cda8
Merge branch 'master' into refs/top-bases/next
Makefile