Merge branch 'master' into tizen_2.0
authorKeebum Kim <keebum.kim@samsung.com>
Thu, 10 Jan 2013 11:06:37 +0000 (20:06 +0900)
committerKeebum Kim <keebum.kim@samsung.com>
Thu, 10 Jan 2013 11:06:37 +0000 (20:06 +0900)

Trivial merge