Merge branch 'documentation-build-system'
authorWill Thompson <will.thompson@collabora.co.uk>
Tue, 26 Oct 2010 16:11:10 +0000 (17:11 +0100)
committerWill Thompson <will.thompson@collabora.co.uk>
Tue, 26 Oct 2010 16:11:10 +0000 (17:11 +0100)
1  2 
Makefile.am

diff --cc Makefile.am
Simple merge