Patch to merge in re driver from STABLE
Authored by: jpaetzel 2011-05-04
Parent: [r6235]
Child: [r6237]