Upstream g-s-d has a patch for this now which will need some cleanup for trunk, but should do fine for maverick.
Upstream g-s-d has a patch for this now which will need some cleanup for trunk, but should do fine for maverick.