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)
Conflicts:
packaging/libprovider.spec
src/provider_buffer.c

Change-Id: Ib7031ce67ed40b49e6a33d699f78c1414475aa09


Trivial merge