Merge branch 'scripts'
authorMichal Marek <mmarek@suse.cz>
Mon, 28 May 2012 13:05:47 +0000 (15:05 +0200)
committerMichal Marek <mmarek@suse.cz>
Mon, 28 May 2012 13:05:47 +0000 (15:05 +0200)
commit2cef4fa0d947b917d91f6b4d4449447f6d64c6fe
treeb0abf7077cef4255b3fabe837be580f885212343
parent64b97cdc4b8be48e9f7d04d2b9bd3def070923ce
parentcffd5eb57f852c26fef949b404ea6288067685cc
Merge branch 'scripts'

Conflicts:
scripts/run_oldconfig.sh