am 63cbe37d: Merge "Fix for P R O G U A R D Issues" into gingerbread

* commit '63cbe37d537f5ba030b4a495f8b08b457ba7ffa5':
  Fix for P R O G U A R D Issues