Merge branch 'next' into refs/top-bases/pu
commitdd5bda84324e4388cb8f7982514431625026dbb1
authorPetr Baudis <pasky@suse.cz>
Sun, 12 Oct 2008 14:34:26 +0000 (12 16:34 +0200)
committerPetr Baudis <pasky@suse.cz>
Sun, 12 Oct 2008 14:34:26 +0000 (12 16:34 +0200)
tree6418f059d16753424d5c1195c30dca883e2025ec
parent3f72ab572fe63c1945127c811a7c347dd148095b
parent755023a7664894dbd1d7463242d8135653d14086
Merge branch 'next' into refs/top-bases/pu