Merge remote-tracking branch 'origin/master' into ecc_p256
authorNIIBE Yutaka <gniibe@fsij.org>
Wed, 13 Feb 2013 11:14:41 +0000 (20:14 +0900)
committerNIIBE Yutaka <gniibe@fsij.org>
Wed, 13 Feb 2013 11:14:41 +0000 (20:14 +0900)

Trivial merge