While this issue is by chx and patch by Jaza, it doesn't seems to have gotten much review: http://drupal.org/node/16542 Please take a look, since this seems like an important bug fix/feature.