merge of '17057efdb800e46279b35519a9e48596acc03145'
authorManuel Teira <manuel.teira@telefonica.net>
Sun, 6 May 2007 18:20:28 +0000 (18:20 +0000)
committerManuel Teira <manuel.teira@telefonica.net>
Sun, 6 May 2007 18:20:28 +0000 (18:20 +0000)
commit6df2418a18cd54934728e1e0ccc9b155c2abd910
tree56799ad435319cf6671ba911c7d321ab1367bad2
parent48b4405a1033f118b112f44cc78548f5b01e309d
parentb1fa8473a71adf7d995a45092b20846351e4b443
Merge ... '17057efdb800e46279b35519a9e48596acc03145'
     and '7c1f2774eda0a945488464d01c4a1231a72fec3b'