Merge branch 'master' into tizen_2.1 accepted/tizen_2.1/20130425.023924 submit/tizen_2.1/20130424.235321
authorYoumin Ha <youmin.ha@samsung.com>
Thu, 18 Apr 2013 10:23:54 +0000 (19:23 +0900)
committerYoumin Ha <youmin.ha@samsung.com>
Thu, 18 Apr 2013 10:23:54 +0000 (19:23 +0900)

Trivial merge