merge of '3d3b8efee4f3f371f1f3681477f3c3b5c3f17b52'
authorManuel Teira <manuel.teira@telefonica.net>
Sun, 6 May 2007 18:16:06 +0000 (18:16 +0000)
committerManuel Teira <manuel.teira@telefonica.net>
Sun, 6 May 2007 18:16:06 +0000 (18:16 +0000)
     and '829ba9b3511d563a73ac9980eaa8861d2187d81e'


Trivial merge