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

Trivial merge