Merge with master branch tizen_2.1 2.1b_release accepted/tizen_2.1/20130425.024747 submit/tizen_2.1/20130424.234115 submit/tizen_2.2/20130714.150015
authorLi Zhang <li2012.zhang@samsung.com>
Mon, 1 Apr 2013 11:04:59 +0000 (19:04 +0800)
committerLi Zhang <li2012.zhang@samsung.com>
Mon, 1 Apr 2013 11:04:59 +0000 (19:04 +0800)
commit95fc28a20282a3196e9c9864e3a2183ee689cd08
tree1ebfd9506095c83d9afcd5aa53b1d085d66a0de2
parentc1f8da932b0934c055c2f4728d16620777b4e5b7
Merge with master branch

Change-Id: Ie41101ea40d8713cdad7957596d7595f5a69f094
configure.ac
packaging/ise-engine-default.spec
src/isf_default_imengine.cpp