Merge branch 'master' of wendt.se:hermes
authorFredrik Wendt <fredrik@wendt.se>
Sun, 6 Jun 2010 16:43:42 +0000 (18:43 +0200)
committerFredrik Wendt <fredrik@wendt.se>
Sun, 6 Jun 2010 16:43:42 +0000 (18:43 +0200)

Trivial merge