Merge branch 'master' into upstream
authorJiri Kosina <jkosina@suse.cz>
Fri, 24 Sep 2010 12:03:37 +0000 (14:03 +0200)
committerJiri Kosina <jkosina@suse.cz>
Fri, 24 Sep 2010 12:03:37 +0000 (14:03 +0200)

Trivial merge