Merge commit 'origin/vuplus-1.6' into vuplus-1.6
authorikseong <ikseong@vuplus>
Fri, 27 Aug 2010 06:15:01 +0000 (15:15 +0900)
committerikseong <ikseong@vuplus>
Fri, 27 Aug 2010 06:15:01 +0000 (15:15 +0900)

Trivial merge