Merge branch 'develop' into release
authordonghyuk.yang <donghyuk.yang@samsung.com>
Fri, 4 Jan 2013 02:12:32 +0000 (11:12 +0900)
committerdonghyuk.yang <donghyuk.yang@samsung.com>
Fri, 4 Jan 2013 02:13:05 +0000 (11:13 +0900)

Trivial merge