tree 63bc720c0ffe5f4760cac4ed617b9870b050175e
parent 504499f22c08a03e2e19dc88d31aa0ecd2ac815e
parent 6313e3c21743cc88bb5bd8aa72948ee1e83937b6
author Jiri Kosina <jkosina@suse.cz> 1291990758 +0100
committer Jiri Kosina <jkosina@suse.cz> 1291990758 +0100

Merge branch 'master' into upstream