[bareftp/f13/master: 5/5] Merge branch 'master' into f13

[Itamar Reis Peixoto]

commit 08d66bc205d6cef8c2700c8b6bd047b130e2cc4c
Merge: 7fdedb0 b952bad
Author: Itamar Reis Peixoto <itamar at ispbrasil.com.br>
Date:   Fri Nov 26 22:34:16 2010 -0200

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	bareftp.spec
    	sources

 .gitignore   |    1 +
 bareftp.spec |   10 ++++++++--
 sources      |    2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)
---