Snow Leopard: Fix bug in copyright generation
Merge remote-tracking branch 'origin/master'