Merge branch 'tizen' into mw

Conflicts:
	package/changelog
	package/pkginfo.manifest

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

diff --cc package/changelog
index a08af12,dc58cfa..13919a6
--- 1/package/changelog
--- 2/package/changelog
+++ b/package/changelog
@@@ -1,6 -1,9 +1,9 @@@
 -- modify build dependency for the kepler upgrade
 -== Seokgil Kang <seokgil.kang@samsung.com> 2014-08-29
+ * 2.2.26
++- 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