[MERGE REVIEW] Tweaks to bundle merging

[Aaron Bentley]

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

Alexander Belchenko has recently experienced problems because bzr merge
conflates malformed bundles and not-a-bundle situations.  This patch
changes that handling so that if you try to merge a malformed bundle,
you'll get suitable errors.

Also, it fixes a missing import in apply_bundle.

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

iD8DBQFEhcif0F+nu1YWqI0RAl3NAKCEFYxX2os9kfZdrMvZhX0Som77WACeO+tk
A7ZJvwv/PZQUbcbsEujmUeQ=
=mwPA
-----END PGP SIGNATURE-----