Merge branch 'develop' into osprel-2.0a1
authorsyeon.hwang <syeon.hwang@samsung.com>
Thu, 24 May 2012 07:07:22 +0000 (16:07 +0900)
committersyeon.hwang <syeon.hwang@samsung.com>
Thu, 24 May 2012 07:07:22 +0000 (16:07 +0900)

Trivial merge