[MERGE] Container format version 2

[Aaron Bentley]

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

Andrew Bennetts wrote:
> I haven't made any effort to keep reading format 1 (or support generating it),
> because it hasn't been used in any released code yet AFAIK.  If someone does
> need this then I can spend some effort on this backwards compatibility, just
> let me know.

Although nothing supporting container format 1 has been merged yet, it's
not for lack of trying.  I really hope this isn't going to add
complications getting Bundle format 4 merged.

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

iD8DBQFGnJy90F+nu1YWqI0RAg3vAJ0e3SiW/l6DK1ymD1oQnjS6yGG96QCfWFhp
G93TzVq/Xyon5oWJ6ypBcPs=
=r8ru
-----END PGP SIGNATURE-----