Merge branch 'release-4-5-patches'
authorDavid van der Spoel <spoel@xray.bmc.uu.se>
Mon, 30 Aug 2010 18:33:02 +0000 (20:33 +0200)
committerDavid van der Spoel <spoel@xray.bmc.uu.se>
Mon, 30 Aug 2010 18:33:02 +0000 (20:33 +0200)
1  2 
share/template/Makefile.am

Simple merge