Merge branch 'master-vanilla-configs' into vanilla
authorMichal Marek <mmarek@suse.cz>
Wed, 31 Oct 2012 09:40:11 +0000 (10:40 +0100)
committerMichal Marek <mmarek@suse.cz>
Wed, 31 Oct 2012 09:40:11 +0000 (10:40 +0100)
commitc58394cf690f5c5cc0f7d1e5dc1782241d12cbfc
tree8e4b918265be458b65b01b02c06e196fb8a67450
parent53002706675e7f003cad6be9b694ccdebdc66a11
parentd6607a54975fb81cc6bf24f5ee1884033aeee079
Merge branch 'master-vanilla-configs' into vanilla

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