Merge branch 'master' into obi
authorkos <kos@dev3>
Wed, 26 Dec 2012 05:44:28 +0000 (14:44 +0900)
committerkos <kos@dev3>
Wed, 26 Dec 2012 05:44:28 +0000 (14:44 +0900)

Trivial merge