Merge "Merge branch 'develop' into tizen_2.2" into tizen_2.2
authordonghee yang <donghee.yang@samsung.com>
Fri, 28 Jun 2013 06:20:54 +0000 (15:20 +0900)
committerGerrit Code Review <gerrit2@system.s-core.co.kr>
Fri, 28 Jun 2013 06:20:54 +0000 (15:20 +0900)

Trivial merge