Merge branch 'master' of git://git.ikiwiki.info into underlay-da
authorJonas Smedegaard <dr@jones.dk>
Sun, 19 Jul 2009 23:02:19 +0000 (01:02 +0200)
committerJonas Smedegaard <dr@jones.dk>
Sun, 19 Jul 2009 23:02:19 +0000 (01:02 +0200)

Trivial merge