Merge branch 'next' into refs/top-bases/pu
commit3f72ab572fe63c1945127c811a7c347dd148095b
authorPetr Baudis <pasky@suse.cz>
Fri, 3 Oct 2008 15:15:51 +0000 (3 17:15 +0200)
committerPetr Baudis <pasky@suse.cz>
Fri, 3 Oct 2008 15:15:51 +0000 (3 17:15 +0200)
treeddd3fd6c42ea2c0041ca31d374a779cd28f85a05
parentd0075e19b258e8f6eb43a8ca31bfd3cb9dc2a5a4
parent94b5e47f991e4e080d4a45ec4a83246d7042b272
Merge branch 'next' into refs/top-bases/pu

Conflicts:
gitweb/gitweb.perl