Merge branch 'master' into tizen_2.1
authorJihoon Kim <jihoon48.kim@samsung.com>
Fri, 29 Mar 2013 09:10:33 +0000 (18:10 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Fri, 29 Mar 2013 09:10:33 +0000 (18:10 +0900)

Trivial merge