Merge branch 'develop' into release
authordonghee yang <donghee.yang@samsung.com>
Mon, 3 Sep 2012 18:31:44 +0000 (03:31 +0900)
committerdonghee yang <donghee.yang@samsung.com>
Mon, 3 Sep 2012 18:31:44 +0000 (03:31 +0900)

Trivial merge