Merge branch 'master' into release
authorChangsun Lee <cs78.lee@samsung.com>
Sat, 19 Jan 2013 09:21:51 +0000 (18:21 +0900)
committerChangsun Lee <cs78.lee@samsung.com>
Sat, 19 Jan 2013 09:21:51 +0000 (18:21 +0900)

Trivial merge