I have squashed the fixup into the original commit and rebased on 
current master (82ebb785f178d8618d39b658932d23d9f859fc91).  The 
resulting commit is attached.


--
Joseph LaFreniere