Merge branch 'master' into 20_tizen_master
authorChangsun Lee <cs78.lee@samsung.com>
Mon, 7 Jan 2013 11:15:46 +0000 (20:15 +0900)
committerChangsun Lee <cs78.lee@samsung.com>
Mon, 7 Jan 2013 11:15:46 +0000 (20:15 +0900)

Trivial merge