[bash-completion/el5/master: 49/49] Merge branch 'el6' into el5

[Ville Skyttä]

commit d75c148c0f828a36e8dd79fd8e403f635d719121
Merge: 2fdff12 624fe98
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Mon Oct 4 19:19:02 2010 +0300

    Merge branch 'el6' into el5
    
    Conflicts:
    	.gitignore
    	bash-completion.spec
    	sources

 .gitignore                                        |    3 +-
 bash-completion-1.1-service.patch                 |   25 ---
 bash-completion-1.1-vncviewer.patch               |   43 -----
 bash-completion-1.2-init.d.patch                  |   19 ++
 bash-completion-1.2-known_hosts-ipv6-630658.patch |   14 ++
 bash-completion-1.2-rpm-630328.patch              |   78 +++++++++
 bash-completion-1.2-tilde-username-628130.patch   |  117 +++++++++++++
 bash-completion.spec                              |  188 +++++++++++++++------
 bash_completion.sh                                |   12 --
 sources                                           |    3 +-
 10 files changed, 367 insertions(+), 135 deletions(-)
---