Merge commit 'refs/top-bases/next' into nextnext
commit18e6f2bab9e2a85017c93c5cf5330f42f500281c
authorPetr Baudis <pasky@ucw.cz>
Fri, 6 Nov 2009 14:30:01 +0000 (6 15:30 +0100)
committerPetr Baudis <pasky@rover.dkm.cz>
Fri, 6 Nov 2009 14:30:01 +0000 (6 15:30 +0100)
tree55812a6846331f81d18567765a644444cef56038
parent0450e60a9a4f5a107ad48b6812c828ea3338c9ae
parent5fd4900abdb7d9c0e0781775025d92f6be5da828
Merge commit 'refs/top-bases/next' into next