merge of 'b7d0f94193045f08368d5d44995efcc46bee860e'
authorPhilippe De Swert <philippedeswert@scarlet.be>
Sun, 7 Jan 2007 00:16:02 +0000 (00:16 +0000)
committerPhilippe De Swert <philippedeswert@scarlet.be>
Sun, 7 Jan 2007 00:16:02 +0000 (00:16 +0000)
commit5bda51aa63fae89e19c21ad83a4512c7f770a5e7
tree54660ca00be3358d1e79be6637158c3723102a47
parentf96fdd5c948668fe837eafc089ee8d87651d44ef
parent0ba8c7e5d74876994724d14fd60cf2913f8e0cd3
Merge ... 'b7d0f94193045f08368d5d44995efcc46bee860e'
     and 'd7ad7e9fb60baa5f043923ec878a0842fd6db64a'