Bind pkcs12. Refs #77 -- blocked by the x509 work
Add x509 bindings
Do not redefine time_t, since asn1 already defines it.
Move macros to macros, and some functions that have changed between versions to macros
One more macro with a confusing error
Add bindings for nid
Merge pull request #126 from cyli/x509

Add x509 bindings (Refs #77)
Merge branch 'master' into bind-pkcs12

Conflicts:
	cryptography/bindings/openssl/api.py
Merge pull request #135 from cyli/nid

Add bindings for nid (Refs #77)
Alphebetize these things.
Merge pull request #137 from alex/alphabetize

Alphebetize these things.
Merge pull request #132 from alex/bind-pkcs12

Bind pkcs12. Refs #77