Merge remote-tracking branch 'fjoncourt/master'
authorMichael Rash <mbr@cipherdyne.org>
Fri, 28 Jun 2013 01:55:58 +0000 (21:55 -0400)
committerMichael Rash <mbr@cipherdyne.org>
Fri, 28 Jun 2013 01:55:58 +0000 (21:55 -0400)

Trivial merge