Merge 12736:14980 from trunk
authorCasper Hornstrup <chorns@users.sourceforge.net>
Thu, 12 May 2005 21:03:51 +0000 (21:03 +0000)
committerCasper Hornstrup <chorns@users.sourceforge.net>
Thu, 12 May 2005 21:03:51 +0000 (21:03 +0000)
svn path=/branches/xmlbuildsystem/; revision=15248


Trivial merge