Commits in ~brion/statusnet/brion-fixes:compound-keys-fix