[libtelnet/el5: 6/6] Merge branch 'master' into el5

[Sean Middleditch]

commit af144afb7c8d0eaae96fb22c2dca87d8d3e768e0
Merge: febec76 8b69408
Author: Sean Middleditch <sean at mojodo.com>
Date:   Sun Mar 18 18:33:07 2012 -0400

    Merge branch 'master' into el5

 .gitignore     |    1 +
 libtelnet.spec |   16 ++++++++++++++--
 sources        |    2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)
---
diff --cc .gitignore
index 48c6f54,d219c20..963ea30
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,2 @@@
 -libtelnet-0.12.tar.gz
  /libtelnet-0.20.tar.gz
+ /libtelnet-0.21.tar.gz