Merge branch 'master-vanilla-configs' into vanilla
authorMichal Marek <mmarek@suse.cz>
Fri, 1 Mar 2013 16:06:15 +0000 (17:06 +0100)
committerMichal Marek <mmarek@suse.cz>
Fri, 1 Mar 2013 16:06:15 +0000 (17:06 +0100)
commitcfffbea5dcb6c8b96d9a7796912d9b1ed76c98a3
treec5b01221570fec0bddb4ea160026ee993ddfd155
parentf371ee284f7450caa9ed16a1ed1297259bf45411
parentd85872b0eadd4a15c5a6275aaf13df348ac62433
Merge branch 'master-vanilla-configs' into vanilla

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