Merge branch 'master' into sdk
authorHeeJu Kang <mobum.kang@samsung.com>
Thu, 3 Jan 2013 02:26:53 +0000 (11:26 +0900)
committerHeeJu Kang <mobum.kang@samsung.com>
Thu, 3 Jan 2013 02:27:12 +0000 (11:27 +0900)
Change-Id: I34b4c94c402fcbb881d92449a50102dfeab28065


Trivial merge