[ORBit/el6/master: 6/6] Merge remote branch 'origin/master' into el6/master

[Paul Howarth]

commit 9e350547c703e56bb4403ae91ea0ff4e3c5e16d0
Merge: f40e96d 1786768
Author: Paul Howarth <paul at city-fan.org>
Date:   Wed Sep 8 00:06:38 2010 +0100

    Merge remote branch 'origin/master' into el6/master
    
    Conflicts:
    	ORBit.spec

 ORBit-0.5.17-make-3.82.patch |   22 ++++++++++++++++++++++
 ORBit.spec                   |    9 +++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)
---