Merge branch 'gbs_dev' into develop
authordonghyuk.yang <donghyuk.yang@samsung.com>
Wed, 21 Nov 2012 02:49:48 +0000 (11:49 +0900)
committerdonghyuk.yang <donghyuk.yang@samsung.com>
Wed, 21 Nov 2012 02:49:58 +0000 (11:49 +0900)

Trivial merge