Merge branch 'master' into tizen_2.1
authorSooyoung Ha <yoosah.ha@samsung.com>
Tue, 19 Mar 2013 06:01:02 +0000 (15:01 +0900)
committerSooyoung Ha <yoosah.ha@samsung.com>
Tue, 19 Mar 2013 06:01:02 +0000 (15:01 +0900)
Conflicts:
packaging/vmodemd-emul.spec


Trivial merge