Merge branches 'fix_doc', 'general_for' and 'mmbuilder_fixes_and_tests' into wip
authorJean Privat <jean@pryen.org>
Fri, 1 Apr 2011 14:05:11 +0000 (10:05 -0400)
committerJean Privat <jean@pryen.org>
Fri, 1 Apr 2011 14:05:11 +0000 (10:05 -0400)

Trivial merge