[dropbear/el5: 14/14] Merge branch 'el6' into el5

[Jon Ciesla]

commit 29ce566292aaedba52d88a1c913d3a3193808304
Merge: d689ece b268f5a
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Jun 28 10:31:48 2012 -0500

    Merge branch 'el6' into el5
    
    Conflicts:
    	.gitignore

 .gitignore                             |    2 +-
 dropbear-0.50-loginrec-open-modes.diff |   29 -----------------------------
 dropbear.spec                          |   29 +++++++++++++++++++++++------
 sources                                |    2 +-
 4 files changed, 25 insertions(+), 37 deletions(-)
---
diff --cc .gitignore
index 41f0c11,505ac5e..618542e
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
- dropbear-0.50.tar.bz2
 -dropbear-0.52.tar.bz2
 -/dropbear-2012.55.tar.bz2
++dropbear-2012.55.tar.bz2