merge of '4a1db39986930032a5bb0c98be4c4d9618b7dfe1'
authorManuel Teira <manuel.teira@telefonica.net>
Wed, 9 May 2007 18:24:10 +0000 (18:24 +0000)
committerManuel Teira <manuel.teira@telefonica.net>
Wed, 9 May 2007 18:24:10 +0000 (18:24 +0000)
commit70a4fee63081bd6d94ddfd9cbddfed0184f84e29
tree1a525826854e231a298123d10441dd47b5d94878
parent0f6211022df73c7021fccfd55e33b4fa4a375d80
parentb88c680760aa4a4563e6a30a8b9edab310481246
Merge ... '4a1db39986930032a5bb0c98be4c4d9618b7dfe1'
     and 'bda2018eb7c703d44c91c1123462f5c66f5d2816'