merge of '65189cecfff58dc8675ff2bd51e04754045b3402'
authorManuel Teira <manuel.teira@telefonica.net>
Wed, 9 May 2007 18:39:33 +0000 (18:39 +0000)
committerManuel Teira <manuel.teira@telefonica.net>
Wed, 9 May 2007 18:39:33 +0000 (18:39 +0000)
     and 'f21d1e4f099c8aa5f4d101d7436b5f27bfbfc829'


Trivial merge