Merge branch 'master' into release
authorChangsun Lee <cs78.lee@samsung.com>
Thu, 17 Jan 2013 04:48:58 +0000 (13:48 +0900)
committerChangsun Lee <cs78.lee@samsung.com>
Thu, 17 Jan 2013 04:48:58 +0000 (13:48 +0900)

Trivial merge