merge of '804eb98d8c897197185f143b02432c9d71be6caa'
authorManuel Teira <manuel.teira@telefonica.net>
Wed, 9 May 2007 18:15:29 +0000 (18:15 +0000)
committerManuel Teira <manuel.teira@telefonica.net>
Wed, 9 May 2007 18:15:29 +0000 (18:15 +0000)
     and 'febdd12e2deb46ea073d415b228a6fdd938968f3'


Trivial merge