Merge branch 'master' into diablo

Conflicts:
	debian/changelog

diff --cc debian/changelog
index 352c826,08fe538..1fe1c8e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,17 @@@
+ busybox-power (1.21.0power2) unstable; urgency=low
+ 
+   * Apply BusyBox 1.21.0 hotfixes
+   * Divert busybox binary to /opt/busybox-power
+ 
+  -- Dennis Groenen <tj.groenen@gmail.com>  Sat, 16 Mar 2013 11:41:43 +0100
+ 
 +busybox-power (1.21.0power1+diablo0) unstable; urgency=low
 +
 +  * Move Diablo bits from master to a new diablo branch
 +  * Fix build failure on Diablo (revert upstream commit 3c62bba)
 +
 + -- Dennis Groenen <tj.groenen@gmail.com>  Sat, 26 Jan 2013 12:00:25 +0100
 +
  busybox-power (1.21.0power1) unstable; urgency=low
  
    * New upstream release (BusyBox 1.21.0)

diff --cc debian/patches/series
Simple merge