Merge branch 'master' into thumb

Conflicts:
	debian/changelog

diff --cc debian/changelog
index 824ca56,510dd1d..ccfecae
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,13 +1,19 @@@
+ 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+thumb0) unstable; urgency=low
 +
 +  * Merged master
 +
 + -- Dennis Groenen <tj.groenen@gmail.com>  Thu, 25 Oct 2012 21:11:25 +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