Merge branch 'master' into task/slp/release
authorSung-jae Park <nicesj.park@samsung.com>
Mon, 10 Dec 2012 04:53:09 +0000 (13:53 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Mon, 10 Dec 2012 04:53:09 +0000 (13:53 +0900)

Trivial merge