Merge branch 'develop' into release
authordonghee yang <donghee.yang@samsung.com>
Thu, 18 Oct 2012 01:24:50 +0000 (10:24 +0900)
committerdonghee yang <donghee.yang@samsung.com>
Thu, 18 Oct 2012 01:24:50 +0000 (10:24 +0900)

Trivial merge