merge of '7c858c6a8dfae412b188e58878fd0c0a05ceace0'
authorManuel Teira <manuel.teira@telefonica.net>
Tue, 19 Jun 2007 15:59:19 +0000 (15:59 +0000)
committerManuel Teira <manuel.teira@telefonica.net>
Tue, 19 Jun 2007 15:59:19 +0000 (15:59 +0000)
commit1ab244c361defaa10c4aff18b3e6d779bbe07d61
treec6a8dd8eaaa9d9a8ac5ece1c15fe88f322665834
parent483d73655c5057a93f3ebdbe658cc11f82139fa2
parentb94ac129fe9da3a0d1fbe1291477e24b88c9d53e
Merge ... '7c858c6a8dfae412b188e58878fd0c0a05ceace0'
     and 'c385046302747a8125b06bfe218d8d7facab5388'