Merge "Some debugging support." into gingerbread