merge of '804eb98d8c897197185f143b02432c9d71be6caa'
authorManuel Teira <manuel.teira@telefonica.net>
Wed, 9 May 2007 18:15:29 +0000 (18:15 +0000)
committerManuel Teira <manuel.teira@telefonica.net>
Wed, 9 May 2007 18:15:29 +0000 (18:15 +0000)
commitb88c680760aa4a4563e6a30a8b9edab310481246
tree024dbf557a949755d0c59a4f0e150b6fffc9d965
parentf10a61b3798b5f915fc7b3df1c0d12fab26cda94
parent7c8a5f5c35b2e43ca9e420debd61c8a6ee1d771c
Merge ... '804eb98d8c897197185f143b02432c9d71be6caa'
     and 'febdd12e2deb46ea073d415b228a6fdd938968f3'