merge of '25c9bf8030ed9b081cb15b534fe5dbd9bf20ad4e'
authorManuel Teira <manuel.teira@telefonica.net>
Sat, 5 May 2007 21:23:01 +0000 (21:23 +0000)
committerManuel Teira <manuel.teira@telefonica.net>
Sat, 5 May 2007 21:23:01 +0000 (21:23 +0000)
     and '7d71de2436fb40872b9112c4711153f3f0138e15'


Trivial merge