Merge remote-tracking branch 'build_test/vuplus-3.0-next' into vuplus-3.0
authorhschang <chang@dev3>
Wed, 13 May 2015 08:19:49 +0000 (17:19 +0900)
committerhschang <chang@dev3>
Wed, 13 May 2015 08:19:49 +0000 (17:19 +0900)

Trivial merge