merge of '80cb1accdd731a62c0845946a28fde1f35e82d1f'
authorManuel Teira <manuel.teira@telefonica.net>
Tue, 19 Jun 2007 15:58:17 +0000 (15:58 +0000)
committerManuel Teira <manuel.teira@telefonica.net>
Tue, 19 Jun 2007 15:58:17 +0000 (15:58 +0000)
     and 'fb1d8d05881bde082243b8b1fbc739f8a9fab90b'


Trivial merge