Merge vendor tree from api06 branch.
authorTom Hughes <tom@compton.nu>
Mon, 20 Apr 2009 09:17:10 +0000 (09:17 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 20 Apr 2009 09:17:10 +0000 (09:17 +0000)

Trivial merge