tree 02b4c13e5dfc83f0f2f1ad28b3f30a834cb11511
parent 79c78e4afd7b0657f023c213804accd4427d1859
parent bc4eafb77a3479532ab0ef968c0287a8aea9b3c2
author Jeff Muizelaar <jmuizelaar@mozilla.com> 1279235761 -0400
committer Jeff Muizelaar <jmuizelaar@mozilla.com> 1279235761 -0400

Merge branch 'v4' of /Users/jrmuizel/src/qcms-benoit/git/qcms into v4

Conflicts:
	iccread.c