From a8707e48e84706986696a24507d71b55d886a7be Mon Sep 17 00:00:00 2001
From: Michael DeHaan <michael.dehaan@gmail.com>
Date: Mon, 23 Apr 2012 21:06:47 -0400
Subject: [PATCH] Fix merge issue

---
 lib/ansible/runner.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/ansible/runner.py b/lib/ansible/runner.py
index 1c9437a435..fcb26cc4ca 100644
--- a/lib/ansible/runner.py
+++ b/lib/ansible/runner.py
@@ -27,6 +27,7 @@ import random
 import traceback
 import tempfile
 import base64
+import getpass
 
 import ansible.constants as C 
 import ansible.connection