merge
authorx2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Mon, 18 Sep 2006 19:03:21 +0000 (19:03 +0000)
committerx2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Mon, 18 Sep 2006 19:03:21 +0000 (19:03 +0000)
commitd5a28192bf0d9857f2476daec3bb932dc3428683
treed8a11ea9d4e666fa0919fb437249dacda6ba768b
parenta23a946383496bc74f31a12b8207490eb9e9ad4b
merge

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@853 839d8a87-29fc-0310-9880-83ba4fa771e5
ChangeLog