Merge branch 'scripts' into stable
authorMichal Marek <mmarek@suse.cz>
Fri, 10 Aug 2012 15:24:45 +0000 (17:24 +0200)
committerMichal Marek <mmarek@suse.cz>
Fri, 10 Aug 2012 15:24:45 +0000 (17:24 +0200)
commit42fb92d1e8a7b4e5518aa8829f9001b601939271
treef44380cb8f559cd89dbdfb4e34fe1ba50bb04cca
parentdaed3d92188d99adde1b4311042ee73dbf5337c8
parent2d69e698aea1619984f1662995a8846d2510513b
Merge branch 'scripts' into stable