[#3759] merge fixes
Signed-off-by: Dave Brondsema dbrondsema@geek.net
Authored by: Dave Brondsema 2012-03-21
Committed by: Tim Van Steenburgh 2012-05-29
Parent(s): [abd4b2]
Child(ren): [3a9fc2]