MAHOUT-225

[Benson Margulies]

Can someone else commit this since the previous attempter got on an
airplane and hasn't been heard from since?