Merge branch 'genkernel-conf'
authorSebastian Pipping <sebastian@pipping.org>
Sun, 12 Aug 2012 19:03:38 +0000 (21:03 +0200)
committerSebastian Pipping <sebastian@pipping.org>
Sun, 12 Aug 2012 19:03:38 +0000 (21:03 +0200)

Trivial merge