merge of '455cc00abecff1a53a78d22e04a9533677e950a7'
authorManuel Teira <manuel.teira@telefonica.net>
Wed, 9 May 2007 20:17:26 +0000 (20:17 +0000)
committerManuel Teira <manuel.teira@telefonica.net>
Wed, 9 May 2007 20:17:26 +0000 (20:17 +0000)
     and '93a022ce4bed6cb6364be32b60eeca3833859ebd'


Trivial merge