Merge branch 'master' into task/slp/release
authorSung-jae Park <nicesj.park@samsung.com>
Thu, 20 Dec 2012 14:46:28 +0000 (23:46 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Thu, 20 Dec 2012 14:46:28 +0000 (23:46 +0900)

Trivial merge