Merge branch 'master' into thumb

Conflicts:

	debian/changelog

diff --combined debian/changelog
index b725261,fc7ab69..bc85b15
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
+ 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+thumb0) unstable; urgency=low
 +
 +  * Merged master
 +
 + -- Dennis Groenen <tj.groenen@gmail.com>  Sat, 16 Mar 2013 13:05:08 +0100
 +
  busybox-power (1.21.0power2) unstable; urgency=low
  
    * Apply BusyBox 1.21.0 hotfixes
@@@ -11,12 -12,6 +18,12 @@@
  
   -- Dennis Groenen <tj.groenen@gmail.com>  Sat, 16 Mar 2013 11:41:43 +0100
  
 +busybox-power (1.21.0power1+thumb0) unstable; urgency=low
 +
 +  * Merged master
 +
 + -- Dennis Groenen <tj.groenen@gmail.com>  Sun, 27 Jan 2013 13:38:11 +0100
 +
  busybox-power (1.21.0power1) unstable; urgency=low
  
    * New upstream release (BusyBox 1.21.0)
@@@ -25,12 -20,6 +32,12 @@@
  
   -- Dennis Groenen <tj.groenen@gmail.com>  Tue, 22 Jan 2013 12:45:45 +0100
  
 +busybox-power (1.20.2power5+thumb0) unstable; urgency=low
 +
 +  * Merged master
 +
 + -- Dennis Groenen <tj.groenen@gmail.com>  Fri, 30 Nov 2012 19:58:28 +0100
 +
  busybox-power (1.20.2power5) unstable; urgency=low
  
    * Introduce Diablo support (by Teemu Ikonen)
@@@ -41,12 -30,6 +48,12 @@@
  
   -- 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
@@@ -60,12 -43,6 +67,12 @@@
  
   -- Dennis Groenen <tj.groenen@gmail.com>  Wed, 24 Oct 2012 17:55:14 +0200
  
 +busybox-power (1.20.2power3+thumb0) unstable; urgency=low
 +
 +  * Merged master
 +
 + -- Dennis Groenen <tj.groenen@gmail.com>  Sat, 13 Oct 2012 16:24:27 +0200
 +
  busybox-power (1.20.2power3) unstable; urgency=low
  
    * Exit shell cleanly upon receiving SIGHUP
@@@ -80,12 -57,6 +87,12 @@@ busybox-power (1.20.2power2) unstable; 
  
   -- Dennis Groenen <tj.groenen@gmail.com>  Wed, 19 Sep 2012 23:39:03 +0200
  
 +busybox-power (1.20.2power1-thumb0) unstable; urgency=low
 +
 +  * Enable thumb compilation
 +
 + -- Dennis Groenen <tj.groenen@gmail.com>  Sat, 25 Aug 2012 14:54:55 +0200
 +
  busybox-power (1.20.2power1) unstable; urgency=low
  
    * New upstream release (BusyBox 1.20.2)