Merge branch 'master' into thumb

Conflicts:

	debian/changelog

diff --cc 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