Merge branch 'master-vanilla-configs' into vanilla
authorMichal Marek <mmarek@suse.cz>
Thu, 13 Dec 2012 08:45:34 +0000 (09:45 +0100)
committerMichal Marek <mmarek@suse.cz>
Thu, 13 Dec 2012 08:45:34 +0000 (09:45 +0100)
commit55542512624c0406cf5e1305e8768d8b280c6cef
tree08abd46756c98044cf88332f87fd02b9fe30f6b9
parent01e20f396684b693a08b2b25fbcecc53dc121f7b
parent63b6c488f1f105f5ca8317eb15838f0dbada0e01
Merge branch 'master-vanilla-configs' into vanilla

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