Merge branch 'master' into harmattan

Conflicts:

	debian/changelog

diff --cc debian/changelog
index 40c9b06,fc7ab69..1d6f8e8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,17 +1,24 @@@
+ busybox-power (1.21.1power1) unstable; urgency=low
+ 
+   * New upstream release (BusyBox 1.21.1)
+   * swapon: support "pri=NNN" in fstab
+ 
+  -- Dennis Groenen <tj.groenen@gmail.com>  Sun, 18 Aug 2013 11:26:49 +0200
+ 
+ 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+harmattan0) unstable; urgency=low
 +
 +  * Merged master
 +  * Do not build busybox-power-althist in the Harmattan target
 +
 + -- Dennis Groenen <tj.groenen@gmail.com>  Sat, 26 Jan 2013 11:20:29 +0100
 +
  busybox-power (1.21.0power1) unstable; urgency=low
  
    * New upstream release (BusyBox 1.21.0)

diff --cc debian/patches/series
Simple merge