Merge branch 'extras-devel-package'

Conflicts:
	debian/changelog

diff --cc debian/changelog
index ddb962e,bff7281..f21e9a4
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,4 +1,9 @@@
 +situare (0.7-0) unstable; urgency=low
 +  * Situare Beta Release (Intermediate build)
 +
-  -- Kaj Wallin <kaj.wallin@ixonos.com>  Mon, 16 Jun 2010 08:20:00 +0300
++ -- Kaj Wallin <kaj.wallin@ixonos.com>  Sat, 19 Jun 2010 08:20:00 +0300
 +
- situare (0.6-2) unstable; urgency=low
+ situare (0.6-5) unstable; urgency=low
    * Situare Beta Release
  
    * New Features:

diff --cc src/src.pro
Simple merge