[MERGE] Prevent knit corruption by checking parents

[Aaron Bentley]

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

Aaron Bentley wrote:

It seems like this is a good bugfix to have in 0.11.  Could I get a review?

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

iD8DBQFFE9xQ0F+nu1YWqI0RAkE4AJwON5oXgf0YBORgwO5fTy6kemy2qwCgh9MY
mBAVRd++YI1vYDcaDg19fbE=
=O0mk
-----END PGP SIGNATURE-----