Merge branch 'master' of gitorious.org:opensuse/zypper
authorMichael Andres <ma@suse.de>
Mon, 28 Feb 2011 15:16:17 +0000 (16:16 +0100)
committerMichael Andres <ma@suse.de>
Mon, 28 Feb 2011 15:16:17 +0000 (16:16 +0100)

Trivial merge