Merge commit 'v2.6.32.25' into zygo-2.6.32.25-zb64

diff --cc Makefile
index 576d3981723894e7a9b7ca5de3e6ac4b371ca486,2b6c7bde5bba5c55526998d0e2a2e81ac643c339..a5dc57799ee574b6016a5fb911f35b8fc5524ce4
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,11 -1,9 +1,11 @@@
  VERSION = 2
  PATCHLEVEL = 6
  SUBLEVEL = 32
- EXTRAVERSION = .24
+ EXTRAVERSION = .25
  NAME = Man-Eating Seals of Antiquity
  
 +EXTRAVERSION := $(EXTRAVERSION)-zb64
 +
  # *DOCUMENTATION*
  # To see a list of typical targets execute "make help"
  # More info can be located in ./README