Merge branch 'master' into tizen_2.1
authorSung-jae Park <nicesj.park@samsung.com>
Thu, 21 Mar 2013 13:01:56 +0000 (13:01 +0000)
committerSung-jae Park <nicesj.park@samsung.com>
Thu, 21 Mar 2013 13:01:56 +0000 (13:01 +0000)
commit97672d00067a4082d61a8806322c630037d1c44d
tree7d16adf716fb6658ef8b1b355e192091a30be6b7
parent7a09de6b22af0c7eb5088056508b9c91e8b60788
parent933aa51def66a577894bf210cff21378f9d2a43a
Merge branch 'master' into tizen_2.1

Conflicts:
include/util.h
packaging/liblivebox-service.spec
src/livebox-service.c
src/util.c

Change-Id: I77c84462bc45b95016b8af4754a1b433d607dd7d