Merge branch 'master-vanilla-configs' into vanilla
authorMichal Marek <mmarek@suse.cz>
Thu, 25 Apr 2013 10:13:50 +0000 (12:13 +0200)
committerMichal Marek <mmarek@suse.cz>
Thu, 25 Apr 2013 10:13:50 +0000 (12:13 +0200)
commitdf169baecddf15538e410873b18d8a103e4d72ff
tree3645205dc2e80d07b0f670ad04ae8159c5c82b82
parent1253c1af3b47416924df24c638fa23d76dccb8da
parent2c768529491be05432dc245a03186722d68aded9
Merge branch 'master-vanilla-configs' into vanilla

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