Merge branch 'master' into tizen_2.0
authorSeunghwan Lee <sh.cat.lee@samsung.com>
Fri, 25 Jan 2013 07:34:32 +0000 (16:34 +0900)
committerSeunghwan Lee <sh.cat.lee@samsung.com>
Fri, 25 Jan 2013 07:34:32 +0000 (16:34 +0900)

Trivial merge