Merge branch 'develop' into release
authordonghee yang <donghee.yang@samsung.com>
Fri, 28 Dec 2012 07:14:46 +0000 (16:14 +0900)
committerdonghee yang <donghee.yang@samsung.com>
Fri, 28 Dec 2012 07:14:46 +0000 (16:14 +0900)

Trivial merge