Merge branch 'master' into tizen_2.1
authorSung-jae Park <nicesj.park@samsung.com>
Thu, 21 Mar 2013 13:08:14 +0000 (13:08 +0000)
committerSung-jae Park <nicesj.park@samsung.com>
Thu, 21 Mar 2013 13:08:14 +0000 (13:08 +0000)
commit9a5e6853e36482f4d29300e8f274c5186284339b
tree38bbaa01fe294a8b48945f81eaf24821ba468c16
parent20b9fad0091c679df3dce54907d47ec8ee88603e
parentcad147280c73d923e12d24ac890710e6a9b608cf
Merge branch 'master' into tizen_2.1

Conflicts:
packaging/libprovider.spec
src/provider_buffer.c

Change-Id: Ib7031ce67ed40b49e6a33d699f78c1414475aa09