[#1909] Fix some tests broken by rebasing
Signed-off-by: Rick Copeland rcopeland@geek.net
Authored by: Rick Copeland 2011-04-15
Parent(s): [407fe9]
Child(ren): [b11dd6]