Merge branch 'rename'
authorMartin Vidner <mvidner@suse.cz>
Wed, 27 Jan 2010 10:56:33 +0000 (11:56 +0100)
committerMartin Vidner <mvidner@suse.cz>
Wed, 27 Jan 2010 10:56:33 +0000 (11:56 +0100)
commitbe6f30ceedb04b3f3791c3cef1716dc9cd21e99b
treeeadce6297a3a8d7fc336f752e1f7529a2d61a699
parent55524ef73e78cbd5234dafb63d010e36f63a29f3
parent3c81bbc60930bd94b317c6963e2259827009aa51
Merge branch 'rename'

Resolved changelog conflicts:
plugins/network/package/webyast-network-ws.changes
plugins/patches/package/webyast-software-ws.changes
plugins/services/package/webyast-services-ws.changes
plugins/status/package/webyast-status-ws.changes
webservice-tasks/package/rubygem-webyast-rake-tasks.changes
webservice/package/webyast-base-ws.changes
18 files changed:
plugins/administrator/package/webyast-root-user-ws.spec
plugins/language/package/webyast-language-ws.spec
plugins/mail_settings/package/webyast-mail-ws.spec
plugins/network/package/webyast-network-ws.changes
plugins/network/package/webyast-network-ws.spec
plugins/ntp/package/webyast-ntp-ws.spec
plugins/patches/package/webyast-software-ws.changes
plugins/patches/package/webyast-software-ws.spec
plugins/registration/package/webyast-registration-ws.spec
plugins/services/package/webyast-services-ws.changes
plugins/services/package/webyast-services-ws.spec
plugins/status/package/webyast-status-ws.changes
plugins/status/package/webyast-status-ws.spec
plugins/system/package/webyast-reboot-ws.spec
plugins/time/package/webyast-time-ws.spec
webservice-tasks/package/rubygem-webyast-rake-tasks.changes
webservice/package/webyast-base-ws.changes
webservice/package/webyast-base-ws.spec