Merge branch 'master' into tizen_2.0
authorSooyoung Ha <yoosah.ha@samsung.com>
Thu, 17 Jan 2013 12:30:33 +0000 (21:30 +0900)
committerSooyoung Ha <yoosah.ha@samsung.com>
Thu, 17 Jan 2013 12:30:33 +0000 (21:30 +0900)
Conflicts:
packaging/vmodemd-emul.spec


Trivial merge