Merge remote-tracking branch 'origin/master' into ecc_p256
authorNIIBE Yutaka <gniibe@fsij.org>
Sun, 17 Feb 2013 12:28:58 +0000 (21:28 +0900)
committerNIIBE Yutaka <gniibe@fsij.org>
Sun, 17 Feb 2013 12:28:58 +0000 (21:28 +0900)

Trivial merge