[openvas-client/f14/master: 4/4] Merge remote-tracking branch 'origin/master' into f14/master

[rebus]

commit e50f801482ac4a7266c382fafa8d791c3f3f36ad
Merge: 51107cc 0dc59a9
Author: Michal Ambroz <rebus at seznam.cz>
Date:   Wed Apr 13 22:54:30 2011 +0200

    Merge remote-tracking branch 'origin/master' into f14/master
    
    Conflicts:
    	.gitignore
    	openvas-client.spec

 .gitignore                  |    5 +-
 openvas-client-lib4.patch   |  171 +++++++++++++++++++++++++++++++++++++++++++
 openvas-client-ports4.patch |   45 +++++++++++
 openvas-client.spec         |   26 +++++-
 sources                     |    2 +-
 5 files changed, 241 insertions(+), 8 deletions(-)
---
diff --cc openvas-client.spec
index 66547f7,b99d375..ff9b875
--- a/openvas-client.spec
+++ b/openvas-client.spec
@@@ -90,11 -96,13 +100,17 @@@ rm -rf %{buildroot
  %{_datadir}/applications/*
  
  %changelog
+ * Fri Mar 18 2011 Michal Ambroz <rebus at, seznam.cz> - 3.0.3-1
+ - Bump to latest stable release 4
+ 
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.2-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
 -* Tue Nov 23 2010 Stjepan Gros <stjepan.gros at gmail.com> - 3.0.2-1
 +* Tue Dec 14 2010 Stjepan Gros <stjepan.gros at gmail.com> - 3.0.2-1
 +- Fixed build require of libuuid so that it works on CentOS5 also
 +- Upgraded to real latest stable release
 +
 +* Tue Nov 23 2010 Stjepan Gros <stjepan.gros at gmail.com> - 3.0.1-1
  - Synced with latest stable upstream release
  - Removed patches because upstream applied them