Merge branch 'master-vanilla-configs' into vanilla
authorMichal Marek <mmarek@suse.cz>
Mon, 18 Mar 2013 09:10:14 +0000 (10:10 +0100)
committerMichal Marek <mmarek@suse.cz>
Mon, 18 Mar 2013 09:10:14 +0000 (10:10 +0100)
commit6af2b5ba6fbe1113b2c5ae9b5a3550e37d881d8c
tree079c1d67a12f67a55e0eaf06a28f455fbd3a9334
parentd8c93b4f6d68d3f747e18bc5012bd75825384631
parentf10ab2fa885d67e87fa93758aa8e63616f84aa77
Merge branch 'master-vanilla-configs' into vanilla

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