Merge branch 'master' into harmattan

Conflicts:
	debian/changelog

diff --cc debian/changelog
index 21f5ac0,510dd1d..0914def
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,13 +1,22 @@@
+ busybox-power (1.20.2power5) unstable; urgency=low
+ 
+   * Introduce Diablo support (by Teemu Ikonen)
+   * Don't show the first time inst. warning when /tmp/.bbp-unattended exists
+   * Don't use local diversions
+   * Modify warning messages to include more useful information
+   * Check for $DISPLAY and $SSH_TTY in preinst
+ 
+  -- Dennis Groenen <tj.groenen@gmail.com>  Wed, 28 Nov 2012 22:30:14 +0100
+ 
 +busybox-power (1.20.2power4+harmattan0) unstable; urgency=low
 +
 +  * Apply initial Harmattan specific config changes
 +  * Add aegis manifest file
 +  * Update debian/control file
 +  * Remove patches that are not applicable to Harmattan
 +
 + -- Dennis Groenen <tj.groenen@gmail.com>  Wed, 24 Oct 2012 22:10:00 +0200
 +
  busybox-power (1.20.2power4) unstable; urgency=low
  
    * Divert /bin/busybox during installation

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge