Merge branch 'master' into task/slp/release
authorSung-jae Park <nicesj.park@samsung.com>
Sun, 27 Jan 2013 04:29:30 +0000 (04:29 +0000)
committerSung-jae Park <nicesj.park@samsung.com>
Sun, 27 Jan 2013 04:29:30 +0000 (04:29 +0000)

Trivial merge