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

Trivial merge