Impliment salmon-related fix - see https://gitorious.org/statusnet/rozzin/commit/fda85285d59fdf14d90e180368a30816dfb72323 for more info