Merge branch 'master' of git+ssh://git@git.wolf31o2.org/var/gitroot/projs/genkernel
authorJoshua Jackson <tsunam@tsunam.org>
Wed, 25 Feb 2009 00:00:55 +0000 (16:00 -0800)
committerJoshua Jackson <tsunam@tsunam.org>
Wed, 25 Feb 2009 00:00:55 +0000 (16:00 -0800)

Trivial merge