This needs to be fixed upstream in the code.google.com project -- we'll pull it in at some point after that's done.