merge of '25c9bf8030ed9b081cb15b534fe5dbd9bf20ad4e'
authorManuel Teira <manuel.teira@telefonica.net>
Sat, 5 May 2007 21:23:01 +0000 (21:23 +0000)
committerManuel Teira <manuel.teira@telefonica.net>
Sat, 5 May 2007 21:23:01 +0000 (21:23 +0000)
commiteb6dc547215e358b86ae66fb6cef0453afbef287
tree2c68af01fa642634fe477eb66e1ee2d0d8039fd0
parentfaf3482413a3d1a7e121aaf3fdff2497b56c089e
parentf1207ed09f49d66754ed00a9e03b52b3523c9cd2
Merge ... '25c9bf8030ed9b081cb15b534fe5dbd9bf20ad4e'
     and '7d71de2436fb40872b9112c4711153f3f0138e15'