Merge remote branch 'origin/master' into dev
authorhschang <chang@dev3>
Thu, 14 Feb 2013 08:39:11 +0000 (17:39 +0900)
committerhschang <chang@dev3>
Thu, 14 Feb 2013 08:39:11 +0000 (17:39 +0900)

Trivial merge