Merge branch 'vendor/EXPAT'
authorMatthew Dillon <dillon@apollo.backplane.com>
Tue, 23 Feb 2010 17:36:26 +0000 (09:36 -0800)
committerMatthew Dillon <dillon@apollo.backplane.com>
Tue, 23 Feb 2010 17:36:26 +0000 (09:36 -0800)

Trivial merge