tree 797676a336b050bfa1ef879377c07e541b9075d6
parent 4cb3ca7cd7e2cae8d1daf5345ec99a1e8502cf3f
parent c81eddb0e3728661d1585fbc564449c94165cc36
author Jiri Kosina <jkosina@suse.cz> 1271981324 +0200
committer Jiri Kosina <jkosina@suse.cz> 1271981324 +0200

Merge branch 'master' into for-next