tree e86e0bab91fd1c2faa678b2c2c8442019bf4f92a
parent 8b66a16f25f819bb1f132f075c5c01a288776cf8
parent 00e7f9649b3061281fe4b463263da26155dc9be4
author Jiri Kosina <jkosina@suse.cz> 1287867293 +0200
committer Jiri Kosina <jkosina@suse.cz> 1287867293 +0200

Merge branch 'waltop' into for-linus