Commits in f-spot/mainline:master