Merge branch 'develop' into release
authordonghyuk.yang <donghyuk.yang@samsung.com>
Tue, 18 Dec 2012 07:59:11 +0000 (16:59 +0900)
committerdonghyuk.yang <donghyuk.yang@samsung.com>
Tue, 18 Dec 2012 07:59:25 +0000 (16:59 +0900)

Trivial merge