Merge branch 'master' into task/slp/release
authorSung-jae Park <nicesj.park@samsung.com>
Wed, 2 Jan 2013 06:18:17 +0000 (15:18 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Wed, 2 Jan 2013 06:18:17 +0000 (15:18 +0900)

Trivial merge