Merge branch 'master' into tizen_2.0
authorSooyoung Ha <yoosah.ha@samsung.com>
Sat, 12 Jan 2013 09:22:12 +0000 (18:22 +0900)
committerSooyoung Ha <yoosah.ha@samsung.com>
Sat, 12 Jan 2013 09:22:12 +0000 (18:22 +0900)
Conflicts:
packaging/vmodemd-emul.spec


Trivial merge