Merge branch 'master' into sdk
authorHeeJu Kang <mobum.kang@samsung.com>
Thu, 3 Jan 2013 07:53:23 +0000 (16:53 +0900)
committerHeeJu Kang <mobum.kang@samsung.com>
Thu, 3 Jan 2013 07:53:31 +0000 (16:53 +0900)
Change-Id: I8e86670b1bc8981f1e47bad5c87138bb59278b4d


Trivial merge