Merge branch 'master' into release
authorChangsun Lee <cs78.lee@samsung.com>
Mon, 21 Jan 2013 07:39:40 +0000 (16:39 +0900)
committerChangsun Lee <cs78.lee@samsung.com>
Mon, 21 Jan 2013 07:39:40 +0000 (16:39 +0900)

Trivial merge