Merge ZORAN_VIDEODEV_2 back into HEAD, also fix a 2.4 compile failure because msleep() is 2.6 only
Authored by: rbultje 2004-09-16
Parent: [r2438]
Child: [r2440]