Merge branch 'master-vanilla-configs' into vanilla
authorMichal Marek <mmarek@suse.cz>
Thu, 26 Apr 2012 09:29:21 +0000 (11:29 +0200)
committerMichal Marek <mmarek@suse.cz>
Thu, 26 Apr 2012 09:29:21 +0000 (11:29 +0200)
commit356aad134a033da7a9b409802de9088d59d6af28
tree70c52a774c9ca736490b9a79de4a5a938d68cab7
parent2aebf6ce560c17c89ca98557d7b9863eb600e2dd
parent47dcd8371528fb9b6ef15da6ac06101151ad0596
Merge branch 'master-vanilla-configs' into vanilla

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