merge of '17057efdb800e46279b35519a9e48596acc03145'
authorManuel Teira <manuel.teira@telefonica.net>
Sun, 6 May 2007 18:20:28 +0000 (18:20 +0000)
committerManuel Teira <manuel.teira@telefonica.net>
Sun, 6 May 2007 18:20:28 +0000 (18:20 +0000)
     and '7c1f2774eda0a945488464d01c4a1231a72fec3b'


Trivial merge