Merge branch 'recurse'
authorFredrik Tolf <fredrik@dolda2000.com>
Sun, 5 Sep 2010 02:32:17 +0000 (04:32 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Sun, 5 Sep 2010 02:32:17 +0000 (04:32 +0200)

Trivial merge