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)
commitbd30a1d0b2485f55a66e4ccb5ba544517517fd24
treef2d1e633ebed4b7e5893506ca44b1e068a26bfb6
parentf43f2cf44bda2ed49baa6c6a99ed02e67c9fa160
parentdda53d1c91d113b01d6981259f4e92f02ed859fb
Merge branch 'master' into tizen_2.1

Conflicts:
packaging/vmodemd-emul.spec