Merge branch 'master' of git@wendt.se:hermes
authorFredrik Wendt <fredrik@wendt.se>
Sun, 6 Jun 2010 22:30:09 +0000 (23:30 +0100)
committerFredrik Wendt <fredrik@wendt.se>
Sun, 6 Jun 2010 22:30:09 +0000 (23:30 +0100)

Trivial merge