Merge branch 'documentation'
Jakub Narebski [Mon, 24 Jan 2011 20:02:39 +0000 (21:02 +0100)]

Trivial merge