Merge branch 'scripts'
authorMichal Marek <mmarek@suse.cz>
Tue, 23 Oct 2012 15:34:21 +0000 (17:34 +0200)
committerMichal Marek <mmarek@suse.cz>
Tue, 23 Oct 2012 15:34:21 +0000 (17:34 +0200)
commit37de05239c1c1b7cdefd1ec1cc6e385d97fb4af5
tree0248571de989887142edaad195f395130e261db3
parent336ead76c4f46e8722590d7a62ea69c88fbdd26c
parent85916db3f1464b19542e7ea11b7011de4b47daf2
Merge branch 'scripts'