Merge branch 'master-vanilla-configs' into vanilla
authorMichal Marek <mmarek@suse.cz>
Mon, 23 Sep 2013 10:13:20 +0000 (12:13 +0200)
committerMichal Marek <mmarek@suse.cz>
Mon, 23 Sep 2013 10:13:20 +0000 (12:13 +0200)
commitcbf00e8cc04bdadc5d546e67e46c2d7d03bc128e
treee77c08ce6f0ad74bf0e37b1542c50d882314173c
parent5f2bc8421a1447d63919b5c5291a8e23f59595c1
parent53326c8afe7d8462364bb0844bb8a3e6e237093f
Merge branch 'master-vanilla-configs' into vanilla

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