[MERGE] Merge directive format 2, Bundle format 4

[Aaron Bentley]

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

Adeodato Simó wrote:
> * Aaron Bentley [Thu, 19 Jul 2007 12:32:31 -0400]:
> 
>> Therefore, I have merged it.
> 
> Since this will appear in 0.19, wouldn't be it better to update the
> description line to read 0.19 instead of 0.18?

Good catch.  I've fixed the format markers and submitted.

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

iD8DBQFGn6qX0F+nu1YWqI0RAq9XAJ0ceN3QMV4y0qIyZYBArUoy7hgS7ACdG/fs
HehU14Yl5JDZTuo6qN7Mt8U=
=wQxY
-----END PGP SIGNATURE-----