merge of '3d3b8efee4f3f371f1f3681477f3c3b5c3f17b52'
authorManuel Teira <manuel.teira@telefonica.net>
Sun, 6 May 2007 18:16:06 +0000 (18:16 +0000)
committerManuel Teira <manuel.teira@telefonica.net>
Sun, 6 May 2007 18:16:06 +0000 (18:16 +0000)
commitb1fa8473a71adf7d995a45092b20846351e4b443
tree700657459a7daf936d5f5f865074f272d119a7d3
parentbfc8952267899530ddb2b1b3c3c30857d2527a87
parenta301fcce2802c9e70f7ce0ab95b3a83836b5d2e6
Merge ... '3d3b8efee4f3f371f1f3681477f3c3b5c3f17b52'
     and '829ba9b3511d563a73ac9980eaa8861d2187d81e'