Merge "Bug 47 fixedgit status"