Merge branch 'master' into task/slp/release
authorSung-jae Park <nicesj.park@samsung.com>
Sat, 24 Nov 2012 07:02:28 +0000 (16:02 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Sat, 24 Nov 2012 07:02:28 +0000 (16:02 +0900)
commit7e80b4db31c49addd67d8d00175652861301000e
tree6efa2b4718c434f057fd516c891293b8d08aeb75
parentf914020efd1126f0993e4e0bc7b9d32baf3dc82a
parent3860bb729bf7032cd796238224cd9518d11e2587
Merge branch 'master' into task/slp/release

Conflicts:
CMakeLists.txt
packaging/liblivebox-viewer.spec

Change-Id: Ica4b083f7893640d71d7035914c903a9f98a324a