Merge branch 'master' into tizen_2.0
authorSooyoung Ha <yoosah.ha@samsung.com>
Tue, 8 Jan 2013 10:59:29 +0000 (19:59 +0900)
committerSooyoung Ha <yoosah.ha@samsung.com>
Tue, 8 Jan 2013 10:59:29 +0000 (19:59 +0900)
Conflicts:
packaging/vmodemd-emul.spec


Trivial merge