Merge branch 'master' of git@git.opensuse.org:projects/zypp/libzypp

Conflicts:
	package/libzypp.changes

diff --cc package/libzypp.changes
index da94ae3,2f7ae71..1d3ff6a
--- 1/package/libzypp.changes
--- 2/package/libzypp.changes
+++ b/package/libzypp.changes
@@@ -1,14 -1,9 +1,19 @@@
  -------------------------------------------------------------------
+ Sun Feb 22 15:27:11 CET 2009 - ma@suse.de
+ 
+ - Never refresh repositories from CD/DVD, once they are created. (bnc #476429)
+ 
+ -------------------------------------------------------------------
 +Sat Feb 21 18:31:17 CET 2009 - dmacvicar@suse.de
 +
 +Implemented the following options with aria backend:
 +
 +- download.max_concurrent_connections (default 2)
 +  download.min_download_speed (default no limit)
 +  download.max_download_speed (default no limit)
 +  download.max_silent_tries (default 5)
 +
 +-------------------------------------------------------------------
  Fri Feb 20 16:28:19 CET 2009 - dmacvicar@suse.de
  
  - MediaAria2c: allow disabling aria2 using ZYPP_ARIA2C=0.