Merge branch 'develop' into staging
authordonghee yang <donghee.yang@samsung.com>
Fri, 14 Dec 2012 02:36:13 +0000 (11:36 +0900)
committerdonghee yang <donghee.yang@samsung.com>
Fri, 14 Dec 2012 02:36:13 +0000 (11:36 +0900)

Trivial merge