Merge branch 'master' into tizen_2.0
authorSeunghwan Lee <sh.cat.lee@samsung.com>
Sat, 2 Feb 2013 08:40:22 +0000 (17:40 +0900)
committerSeunghwan Lee <sh.cat.lee@samsung.com>
Sat, 2 Feb 2013 08:40:22 +0000 (17:40 +0900)

Trivial merge