merge of '4a1db39986930032a5bb0c98be4c4d9618b7dfe1'
authorManuel Teira <manuel.teira@telefonica.net>
Wed, 9 May 2007 18:24:10 +0000 (18:24 +0000)
committerManuel Teira <manuel.teira@telefonica.net>
Wed, 9 May 2007 18:24:10 +0000 (18:24 +0000)
     and 'bda2018eb7c703d44c91c1123462f5c66f5d2816'


Trivial merge