Merge branch 'red' of 84.73.165.173:/home/tgr/repos/net-2.6
authorArnaldo Carvalho de Melo <acme@mandriva.com>
Sun, 6 Nov 2005 00:30:29 +0000 (22:30 -0200)
committerArnaldo Carvalho de Melo <acme@mandriva.com>
Sun, 6 Nov 2005 00:30:29 +0000 (22:30 -0200)

Trivial merge