Merge branch 'develop' into release
authordonghyuk.yang <donghyuk.yang@samsung.com>
Mon, 21 Jan 2013 12:27:28 +0000 (21:27 +0900)
committerdonghyuk.yang <donghyuk.yang@samsung.com>
Mon, 21 Jan 2013 12:27:28 +0000 (21:27 +0900)

Trivial merge