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)
commite3761b8bff47600374803443a97493488bc8b4da
tree890e64d7182873741e31f7fd375eac936f38f744
parent71690a1de45b273789af4e26a01594e9d5150eff
parentfcf40b5e6d18edf6f8d6e3cd7b526be1947c4a76
merged minor updates from master