[pyorbit/f17: 3/3] fix merge

[Peter Robinson]

commit 1bc67a1f18dfd51d9da8041b92e4dca993e3591a
Merge: b1f47c4 ac23fe9
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun Mar 4 14:10:20 2012 +0000

    fix merge

 pyorbit.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---