merge of '06791c441f033cb517879b4808eb801c21997a09'
authorManuel Teira <manuel.teira@telefonica.net>
Wed, 9 May 2007 17:38:30 +0000 (17:38 +0000)
committerManuel Teira <manuel.teira@telefonica.net>
Wed, 9 May 2007 17:38:30 +0000 (17:38 +0000)
commit87794441458ab30060bf947dc354cb79617e70ee
treece0c2296c6c043c32a805d6dd194aac8f4600978
parentd30d62c7be4b3f36005d9de395dd9cf8b84c4d55
parent67727692d651190c52f17b49b67a49cf54dd9286
Merge ... '06791c441f033cb517879b4808eb801c21997a09'
     and '3ba42b444ce34355fb2aa1f92bfea0b8b15018d4'