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)
commitfa6374eb01639b1f25e5de04b48e1889603285ea
tree3a2b6384a769bbfcafa710d8feddf80a7e2bc1ae
parentd3735e62951431d024f9dca94a11e7fd9eaa70fc
parent953ca52ea1b57676f0828f267ae10c99a1435921
Merge branch 'genkernel-conf-2'