Paul Marquis - 2006-11-03

Unified diff against 1.3.8