Merge branch 'master-vanilla-configs' into vanilla
authorMichal Marek <mmarek@suse.cz>
Tue, 23 Jul 2013 10:27:14 +0000 (12:27 +0200)
committerMichal Marek <mmarek@suse.cz>
Tue, 23 Jul 2013 10:27:14 +0000 (12:27 +0200)
commit17fe131b22fa86e89b540d7edbd1abe30c16bd84
treef5e41e5eb7b5b7977fc3c2b4ce18ff614ebbcdc7
parent204c0d2ffda512cdbdb9b787447cba7daa82a9f3
parent3065e576a17cba030bd76bacfe8572cf13f8eb2a
Merge branch 'master-vanilla-configs' into vanilla

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