9630ab2 Fix some issues introduced when rebasing update patch

2 files Authored by rcritten 12 years ago, Committed by simo 12 years ago,
    Fix some issues introduced when rebasing update patch