merge of '12fa8ef0c447968799315a8b55e6d534dbf250ab'
authorManuel Teira <manuel.teira@telefonica.net>
Wed, 2 May 2007 21:42:32 +0000 (21:42 +0000)
committerManuel Teira <manuel.teira@telefonica.net>
Wed, 2 May 2007 21:42:32 +0000 (21:42 +0000)
     and '3ddc510cdb4a7a971e3055493514bb560f25a7d9'


Trivial merge