Daniel,
Can you also pull this into the GDB 6.1 branch?
Andrew