Merge branch 'master-vanilla-configs' into vanilla
authorMichal Marek <mmarek@suse.cz>
Fri, 1 Feb 2013 08:36:12 +0000 (09:36 +0100)
committerMichal Marek <mmarek@suse.cz>
Fri, 1 Feb 2013 08:36:12 +0000 (09:36 +0100)
commitc0204efdf2293d4f582cf5ffcf2b45bdc3d36e15
tree8f911f17a27f414225118d4622b4dd804b98ac55
parent2f11c6b7c71ce6bdb273ab48afe68a50edc4ba98
parent0f82cdaf00f95a445aba04409876af7857e0cf38
Merge branch 'master-vanilla-configs' into vanilla

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