Merge branch 'master' into task/slp/release
authorSung-jae Park <nicesj.park@samsung.com>
Fri, 1 Feb 2013 13:59:20 +0000 (13:59 +0000)
committerSung-jae Park <nicesj.park@samsung.com>
Fri, 1 Feb 2013 13:59:20 +0000 (13:59 +0000)

Trivial merge