Author: mpitt Date: Tue Sep 11 21:09:32 2007 New Revision: 588 Log: dummy-merge of everything in trunk up to 1.3.0-3, so that future merges will work properly Modified: cupsys/branches/cups-1.2-ubuntu/ (props changed)