Merge commit 'hpa/master'
authorErwan Velu <erwan.velu@free.fr>
Sun, 4 Oct 2009 18:44:23 +0000 (20:44 +0200)
committerErwan Velu <erwan.velu@free.fr>
Sun, 4 Oct 2009 18:44:23 +0000 (20:44 +0200)
commit5aeb4beef6c4d5004babd463a2fb5b02af2b4df4
tree7979fbab9c5545a32535a022ff8ca6862b504ae9
parentd5d1a306ce4926f907ace0a7cb79e540cadb77c1
parent87d502a11f288f896387892637c3d83028859fd5
Merge commit 'hpa/master'