Merge branch 'scripts' into SLE11-SP2
authorBenjamin Poirier <bpoirier@suse.de>
Mon, 24 Dec 2012 18:37:56 +0000 (13:37 -0500)
committerBenjamin Poirier <bpoirier@suse.de>
Mon, 24 Dec 2012 18:37:56 +0000 (13:37 -0500)
commit389969acaa627de152f8a54046dc743bb92788e7
treedb0bedeef3d9c60e4cbbbfc78862a3033514f0b5
parent278f1ebe0a25161b2028e138760cd72a47159140
parent6e67a61876f907873955bf8363821bdf922172a0
Merge branch 'scripts' into SLE11-SP2