[mldonkey/el5/master: 15/15] Merge branch 'master' into el5/master

[Peter Lemenkov]

commit 628933e932c52bcfe408f01af795f0f3d8dc81a9
Merge: da8c6f5 8a46f77
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Mon Aug 16 15:00:31 2010 +0400

    Merge branch 'master' into el5/master
    
    Conflicts:
    	.gitignore
    	mldonkey-gui.desktop
    	mldonkey.spec
    	sources

 .gitignore                                         |    1 +
 ...=> mldonkey-0001-Init-script-enhancements.patch |   45 ++++++++++++++++---
 mldonkey-0002-Fix-DSO-linking.patch                |   28 ++++++++++++
 mldonkey-gui.desktop                               |    3 +-
 mldonkey.spec                                      |   23 ++++++++--
 sources                                            |    2 +-
 6 files changed, 87 insertions(+), 15 deletions(-)
---