Brian Robb - 2006-11-21

A diff for the patch