Merge branch 'master-vanilla-configs' into vanilla
authorMichal Marek <mmarek@suse.cz>
Thu, 25 Oct 2012 08:33:44 +0000 (10:33 +0200)
committerMichal Marek <mmarek@suse.cz>
Thu, 25 Oct 2012 08:33:44 +0000 (10:33 +0200)
commitd1bf595e081601d9c88a81bdbe667708c6427d5f
tree4e2441535a6d98f393ac1484c2b72f9bff8b104f
parentee64c2442a68d1eb3eba5a25356965112eda277c
parente5e79863fc594d2e23afeb9f1b5d81a7695276f0
Merge branch 'master-vanilla-configs' into vanilla

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