Merge branch 'master' of code.vuplus.com:/opt/repository/openvuplus
authorkos <kos@dev3>
Thu, 17 Jan 2013 08:03:44 +0000 (17:03 +0900)
committerkos <kos@dev3>
Thu, 17 Jan 2013 08:03:44 +0000 (17:03 +0900)

Trivial merge