Merge branch 'master-vanilla-configs' into vanilla
authorMichal Marek <mmarek@suse.cz>
Wed, 10 Apr 2013 09:52:23 +0000 (11:52 +0200)
committerMichal Marek <mmarek@suse.cz>
Wed, 10 Apr 2013 09:52:23 +0000 (11:52 +0200)
commita6226051026671eb58e7fd34eb70f659e8b2c964
treec79ff8412dc56a8b5a7ffe7c5c000b320ae99116
parent36879121353f47c00ceb547b08e0aed25f63abf7
parentdad332183c756e2a3ef916903f7f554eb2abde17
Merge branch 'master-vanilla-configs' into vanilla

Conflicts:
config/i386/vanilla
config/x86_64/vanilla