2010-08-29Merge heads.
cli [Sun, 29 Aug 2010 17:04:25 +0200] rev 34
Merge heads.