merged minor updates from master
authorMichael Rash <mbr@cipherdyne.org>
Mon, 28 May 2012 18:24:02 +0000 (14:24 -0400)
committerMichael Rash <mbr@cipherdyne.org>
Mon, 28 May 2012 18:24:02 +0000 (14:24 -0400)

Trivial merge