Snow Leopard: Factor out creation of backup files
Merge remote-tracking branch 'origin/master'