Merge branch 'master' into sdk
authorHeeJu Kang <mobum.kang@samsung.com>
Wed, 2 Jan 2013 10:31:05 +0000 (19:31 +0900)
committerHeeJu Kang <mobum.kang@samsung.com>
Wed, 2 Jan 2013 10:35:13 +0000 (19:35 +0900)
Change-Id: I32ed7c35b3f712155675849dbdeb021bfd99f3fb


Trivial merge