Merge branch 'master' into task/slp/release
authorSung-jae Park <nicesj.park@samsung.com>
Fri, 21 Dec 2012 03:51:26 +0000 (12:51 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Fri, 21 Dec 2012 03:51:26 +0000 (12:51 +0900)

Trivial merge