Merge branch 'master-vanilla-configs' into vanilla
authorMichal Marek <mmarek@suse.cz>
Wed, 12 Sep 2012 06:00:17 +0000 (08:00 +0200)
committerMichal Marek <mmarek@suse.cz>
Wed, 12 Sep 2012 06:00:17 +0000 (08:00 +0200)
commit4c865d193d2e80b54d0690b78466a988fc67e299
tree6aef08840cc6e2fdbc57a7308e877fbf92977f84
parent3e7d6877fda2cd718e154aaafbf362a211540ec6
parent83d5ac408b86c4746b4231fbe2515c91b8b27c3b
Merge branch 'master-vanilla-configs' into vanilla
config/i386/vanilla
config/x86_64/vanilla