Merged from parent (trunk r11763, v3.2.0.12+).

diff --cc configure.ac
Simple merge

diff --cc src/DiskIO/DiskFile.h
index 506525fd9f3fe310709a9ad19c86236720d66633,8b3a777f0dcefc81b57807806d9f6d73dde56a77..d5f542d45fc96904355da05db36fc89eca8edfb6
--- 1/src/DiskIO/DiskFile.h
--- 2/src/DiskIO/DiskFile.h
+++ b/src/DiskIO/DiskFile.h
@@@ -49,9 -49,10 +49,10 @@@ class DiskFile : public RefCountabl
  public:
  
      /// generally useful configuration options supported by some children
-     class Config {
+     class Config
+     {
      public:
 -        Config(): ioTimeout(0) {}
 +        Config(): ioTimeout(0), ioRate(-1) {}
  
          /// canRead/Write should return false if expected I/O delay exceeds it
          time_msec_t ioTimeout; // not enforced if zero, which is the default

diff --cc src/DiskIO/IpcIo/IpcIoFile.cc
Simple merge

diff --cc src/cf.data.pre
Simple merge

diff --cc src/fs/rock/RockSwapDir.cc
Simple merge

diff --cc src/fs/rock/RockSwapDir.h
Simple merge

diff --cc src/ipc/AtomicWord.h
Simple merge