Merge branch 'master' into tizen_2.1
authorSooyoung Ha <yoosah.ha@samsung.com>
Tue, 26 Mar 2013 08:38:03 +0000 (17:38 +0900)
committerSooyoung Ha <yoosah.ha@samsung.com>
Tue, 26 Mar 2013 08:38:03 +0000 (17:38 +0900)

Trivial merge