Merge "Bug 46 fixedgit status"