Merge branch 'master' into sdk
authorHeeJu Kang <mobum.kang@samsung.com>
Fri, 4 Jan 2013 06:01:56 +0000 (15:01 +0900)
committerHeeJu Kang <mobum.kang@samsung.com>
Fri, 4 Jan 2013 06:02:04 +0000 (15:02 +0900)
Change-Id: I078f00e1693403a5879ea67af2077cd3da6a4949


Trivial merge