Merge branch 'master' into tizen_2.0
authorSooyoung Ha <yoosah.ha@samsung.com>
Thu, 17 Jan 2013 12:30:33 +0000 (21:30 +0900)
committerSooyoung Ha <yoosah.ha@samsung.com>
Thu, 17 Jan 2013 12:30:33 +0000 (21:30 +0900)
commitf90b66d9a772aa8dccf7d3e8c1da3dd78ebdfd4f
tree43965407732d230a6484ec1e0fa627cf77d53284
parent592180c7306d1cc1ae12d7302af8644476aba83b
parent13a70bb205abbe70c125d69aa285e3f8f9467ffd
Merge branch 'master' into tizen_2.0

Conflicts:
packaging/vmodemd-emul.spec