There is another part that Daviey and I were going to add to this, but I'm going to split that into a different bug, that way this one can be committed. See bug # 542367
There is another part that Daviey and I were going to add to this, but I'm going to split that into a different bug, that way this one can be committed. See bug # 542367