merge of '67942eb62303bea5aa0c7a5139253cfd81baf2b0'
authorManuel Teira <manuel.teira@telefonica.net>
Sun, 6 May 2007 17:45:17 +0000 (17:45 +0000)
committerManuel Teira <manuel.teira@telefonica.net>
Sun, 6 May 2007 17:45:17 +0000 (17:45 +0000)
     and 'f72ecadd8bf2ede2c7c77aa975cb2b763628e511'


Trivial merge