Released on Thu, 23 Aug 2007 15:39:36 +0000
Merge commit 'maks/maks'