Raven's changes
Merge branch 'master' of git://github.com/danvk/sfhistory
Rave work