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)
commitd3735e62951431d024f9dca94a11e7fd9eaa70fc
tree46c85f14f3c4ef675db01476263cf822d15152a1
parenta725f02d008a2546ac3c56513043cb3336833539
parent6d35693a8b8c0baa95b20e4b41ef22eb981a5daa
Merge branch 'genkernel-conf'