merge of '38c8d04b074d2da5c68983c247ecf8522ed92c5c'
authorPhilippe De Swert <philippedeswert@scarlet.be>
Mon, 9 Apr 2007 22:46:10 +0000 (22:46 +0000)
committerPhilippe De Swert <philippedeswert@scarlet.be>
Mon, 9 Apr 2007 22:46:10 +0000 (22:46 +0000)
commit26e1673343a2172a05864d60c1a89da12350f8d1
treee1daaa0dd1d1e603a27fe84f5eaf54024865c520
parent85995285758b6637d074f3cb9c098c297b2875cb
parent83258a6742b4d6346d52cf4fffebcf5458281c4b
Merge ... '38c8d04b074d2da5c68983c247ecf8522ed92c5c'
     and '8e4e5cd6606686e6371b5fa96e75e932ef9a097f'