merge of '06791c441f033cb517879b4808eb801c21997a09'
authorManuel Teira <manuel.teira@telefonica.net>
Wed, 9 May 2007 17:38:30 +0000 (17:38 +0000)
committerManuel Teira <manuel.teira@telefonica.net>
Wed, 9 May 2007 17:38:30 +0000 (17:38 +0000)
     and '3ba42b444ce34355fb2aa1f92bfea0b8b15018d4'


Trivial merge