Merge branch 'master-vanilla-configs' into vanilla
authorMichal Marek <mmarek@suse.cz>
Wed, 25 Sep 2013 10:07:25 +0000 (12:07 +0200)
committerMichal Marek <mmarek@suse.cz>
Wed, 25 Sep 2013 10:07:25 +0000 (12:07 +0200)
commitccdcf1e0553586713bfbc81e4636ba6fa3f40c59
treefb7780c9468195d6831e7c78ce1a077d6f6e4657
parentb0ac944480bdf1a354dee8731b1c0a7ec5eb5c7c
parentca91ac59f3fc8f9ebdc56f4dccf4e5132b648294
Merge branch 'master-vanilla-configs' into vanilla

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