Merge branch 'master-vanilla-configs' into vanilla
authorMichal Marek <mmarek@suse.cz>
Fri, 4 Jan 2013 11:01:03 +0000 (12:01 +0100)
committerMichal Marek <mmarek@suse.cz>
Fri, 4 Jan 2013 11:01:03 +0000 (12:01 +0100)
commitddf980d9387911ee50a8d7ce356508610f0f5bee
treef4d5b3b8bdc3fffe0a14a0ce5daf3f9dae8fa70a
parent042478b2e2b90acd7e251b03c8dd665032a4debc
parent75de63886c5c613f6de58526911066598281708b
Merge branch 'master-vanilla-configs' into vanilla

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