Merge branch 'master' into tizen_2.1
authorYoumin Ha <youmin.ha@samsung.com>
Tue, 16 Apr 2013 04:53:03 +0000 (13:53 +0900)
committerYoumin Ha <youmin.ha@samsung.com>
Tue, 16 Apr 2013 04:53:03 +0000 (13:53 +0900)
commit6b6cb9b6e1ab63f39cc4bfb28597053b3e5c09f0
tree269dbc7ef0204c77c25953bc622350f0de51395e
parent197ab7bff99490509bbbf9b4b129badf97110d48
parentd54e7e91132799352f4353a8a1e960deb631cbfd
Merge branch 'master' into tizen_2.1

Conflicts:
demos/tizen-winsets/widgets/popupwindow/popupwindow.js
src/js/widgets/jquery.mobile.tizen.tokentextarea.js