Merge branch 'master-vanilla-configs' into vanilla
authorMichal Marek <mmarek@suse.cz>
Mon, 28 Jan 2013 12:06:01 +0000 (13:06 +0100)
committerMichal Marek <mmarek@suse.cz>
Mon, 28 Jan 2013 12:06:01 +0000 (13:06 +0100)
commit02dab483fda433b1a11aa87b5cc22f46f4a6f9a5
treeba26fbb8360110634ac0c5ef4849a03179f87595
parent10688fe634eaee5bf24fe131915a9ef3b3700a8e
parenta86d06358ec372808df7d1869f6816124facc597
Merge branch 'master-vanilla-configs' into vanilla

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