merge of '7c858c6a8dfae412b188e58878fd0c0a05ceace0'
authorManuel Teira <manuel.teira@telefonica.net>
Tue, 19 Jun 2007 15:59:19 +0000 (15:59 +0000)
committerManuel Teira <manuel.teira@telefonica.net>
Tue, 19 Jun 2007 15:59:19 +0000 (15:59 +0000)
     and 'c385046302747a8125b06bfe218d8d7facab5388'


Trivial merge