[libtelnet/el6/master: 7/7] merge master into el6 branch

[Sean Middleditch]

commit febec7637d484db0877f8cc5e6d1edf087e3d6e7
Merge: 558bdd3 5bb3251
Author: Sean Middleditch <sean at middleditch.us>
Date:   Fri Sep 17 10:22:57 2010 -0700

    merge master into el6 branch

 .gitignore     |    2 +-
 libtelnet.spec |   13 +++++++++++--
 sources        |    2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index b329fbc,7cb9215..48c6f54
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--libtelnet-0.12.tar.gz
+ /libtelnet-0.20.tar.gz