Merge branch 'master' into tizen_2.0
authorSeunghwan Lee <sh.cat.lee@samsung.com>
Thu, 17 Jan 2013 07:09:14 +0000 (16:09 +0900)
committerSeunghwan Lee <sh.cat.lee@samsung.com>
Thu, 17 Jan 2013 07:09:14 +0000 (16:09 +0900)

Trivial merge