Merge branch 'master' into tizen_2.1
authorKeebum Kim <keebum.kim@samsung.com>
Thu, 21 Mar 2013 07:15:58 +0000 (16:15 +0900)
committerKeebum Kim <keebum.kim@samsung.com>
Thu, 21 Mar 2013 07:15:58 +0000 (16:15 +0900)

Trivial merge