Merge commit 'origin/erwan'
authorErwan Velu <erwan.velu@free.fr>
Wed, 25 Mar 2009 22:38:29 +0000 (23:38 +0100)
committerErwan Velu <erwan.velu@free.fr>
Wed, 25 Mar 2009 22:38:29 +0000 (23:38 +0100)
commit9169a71155fc18d78bd90b364a29e2c88f0e29b6
tree53e52eabf90af47e81c595e4148546d8cf9fb8e2
parent027c8f7418ce6ec9705d4c08b6564b64179e5da8
parent84fa14d88f0dfb8db929e7163b30718f9d104654
Merge commit 'origin/erwan'