Merge commit 'local/vuplus-1.6' into vuplus-1.6
authorikseong <ikseong@vuplus>
Fri, 13 Aug 2010 08:07:53 +0000 (17:07 +0900)
committerikseong <ikseong@vuplus>
Fri, 13 Aug 2010 08:07:53 +0000 (17:07 +0900)

Trivial merge