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

Trivial merge