Merge branch 'asn1-work'
authorStef Walter <stef@memberwebs.com>
Mon, 28 Jun 2010 14:09:41 +0000 (14:09 +0000)
committerStef Walter <stef@memberwebs.com>
Mon, 28 Jun 2010 14:09:41 +0000 (14:09 +0000)

Trivial merge