Merge branch 'upstream' into bug/xmltooling
authorRuss Allbery <rra@debian.org>
Sat, 23 Aug 2008 23:34:38 +0000 (16:34 -0700)
committerRuss Allbery <rra@debian.org>
Sat, 23 Aug 2008 23:34:38 +0000 (16:34 -0700)
commit976e9f1ed371374f8876789f1d896df5c24fc0a3
tree53d47595d428e6afff5ec241e8ae0a632d25e8c6
parent00cc12c03b35f8f916602c1f4493453108eb121a
parent8cfb88bff921f1830d05045bf266b88f8d49abd7
Merge branch 'upstream' into bug/xmltooling