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)
commit9e2b1721b797312dd0b0f7b095ee1f45f2d93a7c
tree0590a309269e956cd9fdf218b3c5df2024d43bb0
parentf8f646c516ab660b31ef81e8345a523f8aee1484
parent1c8dbfc884cbf63c2cb9ceb56000409f3d3bd0e8
Merge branch 'master' into tizen_2.0

Conflicts:
packaging/vmodemd-emul.spec