Merge branch 'maintenance-webyast-1.0' up to commit 'e5863b812bd2cd9316cb48b85700de8b...
authorMartin Vidner <mvidner@suse.cz>
Tue, 20 Jul 2010 08:26:38 +0000 (10:26 +0200)
committerMartin Vidner <mvidner@suse.cz>
Tue, 20 Jul 2010 10:07:59 +0000 (12:07 +0200)
commitb44f3375a7d2ee998f555d2c57d5eacbb9592d88
tree397cbc943f5865d62f7effcbb1cca9a5fad39936
parentf2514d841624f9b3b516194d28f7b8a2a944898e
parente5863b812bd2cd9316cb48b85700de8b38499c56
Merge branch 'maintenance-webyast-1.0' up to commit 'e5863b812bd2cd9316cb48b85700de8b38499c56'

Used the 'ours' strategy, the branch is part backport and part hack
not to be merged.