[MERGE] Fix how cog.py is invoked on Windows

[Aaron Bentley]

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

Mark Hammond wrote:
>   Attached is a patch to how cog.py is executed by the build process.

Bundle buggy isn't recognizing your patches, because of their naming and
content type.

The following file extensions indicate patches: .patch .diff
The following MIME types indicate patches: text/x-patch text/x-diff

Merge directives are always recognized, using their distinctive header.

Merge directives would be best, because this allows Bundle Buggy to
automatically track when your requests are superseded or merged.  You
should be able to generate them by using "bzr send".  bzr will
automatically use your default mail client, via MAPI.

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

iD8DBQFIdLbJ0F+nu1YWqI0RAgfSAJ9Opw0AkUZjHJ7kk4FZXntbzoNDAQCeLUG0
UfKD3haklWJB8py1VPzt+cU=
=qyDe
-----END PGP SIGNATURE-----