Merge remote-tracking branch 'crypto/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 02:13:03 +0000 (12:13 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 02:13:03 +0000 (12:13 +1000)

Trivial merge