Merge branch 'master' into upstream
authorJiri Kosina <jkosina@suse.cz>
Fri, 10 Dec 2010 14:19:18 +0000 (15:19 +0100)
committerJiri Kosina <jkosina@suse.cz>
Fri, 10 Dec 2010 14:19:18 +0000 (15:19 +0100)

Trivial merge