Merge branch 'master' into tizen_2.1
authorSung-jae Park <nicesj.park@samsung.com>
Thu, 21 Mar 2013 13:00:10 +0000 (13:00 +0000)
committerSung-jae Park <nicesj.park@samsung.com>
Thu, 21 Mar 2013 13:00:10 +0000 (13:00 +0000)
commit43c22259fab2c5d553b991fd78b63c3286396743
tree516917bf4d99f6be41d59850ac861a7606d69031
parent3019a34f5308b91e244d1b8e6b38f40c83290952
parent160817bf2cadc6bb920736af680eec9ab4a78828
Merge branch 'master' into tizen_2.1

Conflicts:
packaging/liblivebox-edje.spec
src/script_port.c

Change-Id: I39e25cac21bfb97a362226925df8eb41d1322c1e