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

[Orion Poplawski]

commit 8eb6bb25e4dd26f7aa361dcf3a4c8259a7e13356
Merge: 51e64a3 fffd7e3
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Fri Feb 18 09:36:13 2011 -0700

    Merge branch 'master' into el6

 ncl.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---