merging the two branches

[Glen Mazza]

Jeremias,

Per your email yesterday (which I can't seem to locate
right now) please go ahead and merge the two branches
whenever convenient for you.  I am also looking
forward to this being done.

Thanks,
Glen