Merge branch 'master-vanilla-configs' into vanilla
authorMichal Marek <mmarek@suse.cz>
Wed, 11 Apr 2012 06:58:30 +0000 (08:58 +0200)
committerMichal Marek <mmarek@suse.cz>
Wed, 11 Apr 2012 06:58:30 +0000 (08:58 +0200)
commit0bb6a0cc9102b4098f13f97580a321104a20bade
tree762d0c9fd997137b61de96f750d822a362e42ada
parentd598f9f931e752e0ba8002b3a2745b8178c13f72
parent2d0834ccdc6bd1b96f6ccb7a224a9b85325357c4
Merge branch 'master-vanilla-configs' into vanilla

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