Merge branch 'master' into tizen_2.0
authorSeunghwan Lee <sh.cat.lee@samsung.com>
Wed, 16 Jan 2013 05:45:31 +0000 (14:45 +0900)
committerSeunghwan Lee <sh.cat.lee@samsung.com>
Wed, 16 Jan 2013 05:45:31 +0000 (14:45 +0900)

Trivial merge