merge of '67942eb62303bea5aa0c7a5139253cfd81baf2b0'
authorManuel Teira <manuel.teira@telefonica.net>
Sun, 6 May 2007 17:45:17 +0000 (17:45 +0000)
committerManuel Teira <manuel.teira@telefonica.net>
Sun, 6 May 2007 17:45:17 +0000 (17:45 +0000)
commitae7d1e6a31217e163066e1530b3682989663667e
tree2d05a1461ec0ea74b3d54a2aa10765388a5b6525
parent648b98489eddeb8ef852314741b13a38ae5c1068
parenteb6dc547215e358b86ae66fb6cef0453afbef287
Merge ... '67942eb62303bea5aa0c7a5139253cfd81baf2b0'
     and 'f72ecadd8bf2ede2c7c77aa975cb2b763628e511'