Merge commit 'meins/master'

diff --cc NEWS
index 3f6ae4590bf5febd511f5b71cebd635b12512a5c,47798d732995ccc2f001a31462d5a5c7afa9834b..019f936ef448c242a3ea5798e4475e33e7d89e44
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -5,11 -5,15 +5,15 @@@ NEW
  0.4.1 (to be announced) "concurrent eternalty"
  ----------------------------------------------
  
+ Support for another audio format and bug fixes: All fixes that have
+ been accumulated in the 0.3.6 release appear in this release as well.
+ 
        - wma support
+       - new afh option: --human to activate human-readable output
  
 -------------------------------------------
 -0.3.6 (to be announced) "cubic continuity"
 -------------------------------------------
 +-------------------------------------
 +0.3.6 (2009-12-07) "cubic continuity"
 +-------------------------------------
  
  Quite a few bugs have been found and fixed since 0.3.5, so here's
  another 0.3.x release. No new features.