Merge branch 'gpg1x' into experimental
authorSebastian Pipping <sebastian@pipping.org>
Wed, 12 Jan 2011 16:53:16 +0000 (17:53 +0100)
committerSebastian Pipping <sebastian@pipping.org>
Wed, 12 Jan 2011 16:53:16 +0000 (17:53 +0100)
1  2 
defaults/initrd.scripts

Simple merge