[MERGE] Reconcile can fix bad parent references

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Alexander Belchenko wrote:
> Alexander Belchenko has voted comment.
> Status is now: Semi-approved
> Comment:
> PING. What's the status of this patch now?

AIUI, Andrew is hacking on it now.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFG+YNr0F+nu1YWqI0RAjoiAJ95Rk2aVbIyPfrYcqEWE1rtus/TkwCfeoUP
5MA3tr36QPw4sfdLi+aYVWo=
=EHC2
-----END PGP SIGNATURE-----