Merge branch 'master' into tizen_2.2
authorSooyoung Ha <yoosah.ha@samsung.com>
Fri, 14 Jun 2013 13:34:46 +0000 (22:34 +0900)
committerSooyoung Ha <yoosah.ha@samsung.com>
Fri, 14 Jun 2013 13:34:46 +0000 (22:34 +0900)
Change-ID: I5d303ecf6689cd399b8bf2beb3f1be13b8b2762b


Trivial merge