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

Trivial merge