Removed the annoying "Id" CVS keywords, they're a real PITA when it
comes to merging...