Merge branch 'master' into release
authorChangsun Lee <cs78.lee@samsung.com>
Mon, 21 Jan 2013 10:20:01 +0000 (19:20 +0900)
committerChangsun Lee <cs78.lee@samsung.com>
Mon, 21 Jan 2013 10:20:01 +0000 (19:20 +0900)

Trivial merge