[pyrasite/el6: 3/3] Merge branch 'master' into el6

[Luke Macken]

commit c3042af2b94e3a356d9a15324454c5798fdf1528
Merge: 6ef8c4e c32fb93
Author: Luke Macken <lmacken at redhat.com>
Date:   Tue Aug 21 12:14:03 2012 -0400

    Merge branch 'master' into el6

 pyrasite.spec |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)
---
diff --cc pyrasite.spec
index 8baded1,33f9e22..b7be267
--- a/pyrasite.spec
+++ b/pyrasite.spec
@@@ -15,9 -15,10 +15,11 @@@ BuildRequires:    python-nos
  BuildRequires:    python-sphinx
  
  Requires:         gdb
+ Requires:         python-meliae
+ Requires:         python-urwid
  
 -%if 0%{?rhel} <= 6
 +%if 0%{?rhel}
 +BuildRequires:    python-unittest2
  BuildRequires:    python-argparse
  Requires:         python-argparse
  %endif