Merge commit 'junio/master'
commit5bb5bc48772bcda08062a9564ce5980bf4fc3a62
authorLuiz Fernando N. Capitulino <lcapitulino@mandriva.com.br>
Tue, 31 Jul 2007 17:38:08 +0000 (31 14:38 -0300)
committerLuiz Fernando N. Capitulino <lcapitulino@mandriva.com.br>
Tue, 31 Jul 2007 17:38:08 +0000 (31 14:38 -0300)
treee0646446a447e95c468de81355b282385a9f645c
parent87d1de0528025660bdfb5a5660933762a1821a9a
parent5c759f96d020d7021a7e674c8d1e5bebd17dcd2f
Merge commit 'junio/master'