is anyone using mercurial to manage configuration files? The everything's-a-tip version control paradigm seems like it would be really good for managing configurations; check out a configuration close to what you want, warp it a little, check it back in and keep track of the node and its branch by naming the branch after the node's host name.
http://www.selenic.com/mercurial/wiki/index.cgi/Branch