Merge branch 'master' into thumb

Conflicts:
	debian/changelog
	debian/rules

diff --cc debian/changelog
index 9143483,3ff7403..78760a6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,17 @@@
+ busybox-power (1.21.0power1) unstable; urgency=low
+ 
+   * New upstream release (BusyBox 1.21.0)
+   * Correct the symlink locations of several applets
+   * Generate busybox-power-althist package
+ 
+  -- 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)

diff --cc debian/config/config.busybox
Simple merge

diff --cc debian/control
Simple merge

diff --cc debian/rules
index 40cd87b,3d36226..c68e792
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -13,9 -13,9 +13,9 @@@ STAMPS_DIR = debian/stamp
  ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
        CONFIG_DEBUG = y
  endif
 -ifneq (,$(findstring thumb,$(DEB_BUILD_OPTIONS)))
 +#ifneq (,$(findstring thumb,$(DEB_BUILD_OPTIONS)))
- THUMB := -mthumb
+       THUMB := -mthumb
 -endif
 +#endif
  
  ifneq (,$(findstring parallel,$(DEB_BUILD_OPTIONS)))
      PARALLEL_JOBS := $(shell echo $(DEB_BUILD_OPTIONS) | \