merge from pomme branch
authorPaul Brossier <piem@piem.org>
Wed, 18 Apr 2007 11:18:26 +0000 (13:18 +0200)
committerPaul Brossier <piem@piem.org>
Wed, 18 Apr 2007 11:18:26 +0000 (13:18 +0200)
commit970ef94758d2ec474772a1583a9fb0236deb43da
treef582223b42f71f75fdd2311ef0323639f41c15d7
parent5507e9d32a4a5547d924d71258f2ed77b356dbe3
parent75ad1693954bbf7c2f699e9a5e4d55ad032322b8
merge from pomme branch