Merge branch 'master' into tizen_2.0
authorSeunghwan Lee <sh.cat.lee@samsung.com>
Sat, 26 Jan 2013 04:32:42 +0000 (13:32 +0900)
committerSeunghwan Lee <sh.cat.lee@samsung.com>
Sat, 26 Jan 2013 04:32:42 +0000 (13:32 +0900)

Trivial merge