Merge branch 'develop' into release
authordonghyuk.yang <donghyuk.yang@samsung.com>
Wed, 16 Jan 2013 06:02:01 +0000 (15:02 +0900)
committerdonghyuk.yang <donghyuk.yang@samsung.com>
Wed, 16 Jan 2013 06:02:01 +0000 (15:02 +0900)

Trivial merge