Merge r67713 and r67936 (Eric's parport driver) from trunk