Merge branch 'master-vanilla-configs' into vanilla
authorMichal Marek <mmarek@suse.cz>
Wed, 18 Apr 2012 09:22:55 +0000 (11:22 +0200)
committerMichal Marek <mmarek@suse.cz>
Wed, 18 Apr 2012 09:22:55 +0000 (11:22 +0200)
commit3bd80dd3559ea93c2d4781ee4815961c09e0a118
treef35073c1af342ef4287dc4cc70bfbc782f39e191
parent7e461ce5fe6c1e2ee655fbd4056cef9d053b7b2e
parent1cdec0c9e6d19e844af60297f80fab7636ac0e8c
Merge branch 'master-vanilla-configs' into vanilla

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