Merge branch 'master-vanilla-configs' into vanilla
authorMichal Marek <mmarek@suse.cz>
Tue, 11 Sep 2012 06:00:20 +0000 (08:00 +0200)
committerMichal Marek <mmarek@suse.cz>
Tue, 11 Sep 2012 06:00:20 +0000 (08:00 +0200)
commit971de8cc9ffcfbba6ee13c18f99c556336ddbb7e
tree839bfe819f67db995039f8919084a5460ef9b8d4
parentdd6c7acb09fcbb865509fd84b4ebe769ba91a28b
parenta83424cb9911b5b7b76d8d7b98d4ebfc1143f62c
Merge branch 'master-vanilla-configs' into vanilla