Merge branch 'develop' into release
authordonghee yang <donghee.yang@samsung.com>
Wed, 17 Oct 2012 05:22:07 +0000 (14:22 +0900)
committerdonghee yang <donghee.yang@samsung.com>
Wed, 17 Oct 2012 05:22:07 +0000 (14:22 +0900)

Trivial merge