Merge branch 'develop' into staging
authordonghee yang <donghee.yang@samsung.com>
Thu, 29 Nov 2012 01:07:57 +0000 (10:07 +0900)
committerdonghee yang <donghee.yang@samsung.com>
Thu, 29 Nov 2012 01:07:57 +0000 (10:07 +0900)

Trivial merge