Merge branch 'master' into tizen_2.1
authorMinho Kim <minho07.kim@samsung.com>
Thu, 28 Mar 2013 12:25:59 +0000 (21:25 +0900)
committerMinho Kim <minho07.kim@samsung.com>
Thu, 28 Mar 2013 12:25:59 +0000 (21:25 +0900)

Trivial merge