Merge branch 'master' into tizen_2.0
authorKeebum Kim <keebum.kim@samsung.com>
Sat, 12 Jan 2013 06:38:41 +0000 (15:38 +0900)
committerKeebum Kim <keebum.kim@samsung.com>
Sat, 12 Jan 2013 06:38:41 +0000 (15:38 +0900)

Trivial merge