Created an integration branch for release 0.4. This is intended to be the place to merge the diverging URI branches.
Authored by: glynos 2009-10-04
Parent: [r168]
Child: [r170]