Merge branch 'tizen' into mw

Conflicts:
	package/changelog

Change-Id: I1f4e80642ecdb8e340ecb6bdf0f0ba3b40eff326
Signed-off-by: seokgil.kang <seokgil.kang@samsung.com>

diff --cc package/changelog
index 725054b,8921ee9..d8db658
--- 1/package/changelog
--- 2/package/changelog
+++ b/package/changelog
@@@ -1,19 -1,18 +1,21 @@@
 -* 2.2.29
++* 2.2.30
+ - modify valgrind termination command using profile_command included in the sdbd
+ == Seokgil Kang <seokgil.kang@samsung.com> 2014-10-28
 -* 2.2.28
 +* 2.2.29
  - remove the logic to determine if a symbolic link for 'ld' file exists 
 -== Seokgil Kang <seokgil.kang@samsung.com> 2014-10-13
 -* 2.2.27
 +== Seokgil Kang <seokgil.kang@samsung.com> 2014-10-14
 +* 2.2.28
- <<<<<<< HEAD
  - modify the file name that needs to be confirmed during valgrind installation
  == Seokgil Kang <seokgil.kang@samsung.com> 2014-09-30
 +* 2.2.27
 +- change the PlatformRootstrap
 +== Shihyun kim <shihyun.kim@samsung.com> 2014-09-02
  * 2.2.26
 -- modify build dependency for the kepler upgrade
 -== Seokgil Kang <seokgil.kang@samsung.com> 2014-08-29
 +- fix potential bug
 +== Seokgil Kang <seokgil.kang@samsung.com> 2014-09-01
  * 2.2.25
 -- apply prerequisites
 -== Seokgil Kang <seokgil.kang@samsung.com> 2014-08-07
 +- modify build dependency for the kepler upgrade
 +== Seokgil Kang <seokgil.kang@samsung.com> 2014-08-22
  * 2.2.24
  - apply the improvements of the on-demand installation feature of valgrind
  == Seokgil Kang <seokgil.kang@samsung.com> 2014-08-05

diff --cc package/pkginfo.manifest
index 5cfaba2,5cfaba2..3dd723e
--- 1/package/pkginfo.manifest
--- 2/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -1,5 -1,5 +1,5 @@@
  Source:profiler-eplugin
--Version:2.2.29
++Version:2.2.30
  Maintainer:seokgil.kang <seokgil.kang@samsung.com>, Juyoung Kim
  
  Package:profiler-eplugin