Merge branch 'master' into tizen_2.1
authorSung-jae Park <nicesj.park@samsung.com>
Thu, 21 Mar 2013 12:57:53 +0000 (12:57 +0000)
committerSung-jae Park <nicesj.park@samsung.com>
Thu, 21 Mar 2013 12:57:53 +0000 (12:57 +0000)
commit378bf1ed41dffce2f73dded4b8d84057a24900cf
tree5a83ce06d3b30df89f8eed31841860371e9ccf5d
parent5680457bfbf1e4fe6ceb4432f9a1fdb2a6e1cd29
parent9ddf511e0e52f609ccef7d2ce7d95f2784b4522b
Merge branch 'master' into tizen_2.1

Conflicts:
packaging/liblivebox.spec
src/livebox.c

Change-Id: Ia4cccebd50b8613537af419233052d04f91f98d7