[ocp/f14/master: 2/2] Merge branch 'master' into f14

[Charles R. Anderson]

commit eae709e55ff75ce656d8407f564da05e834df680
Merge: d2b0f11 492ca2a
Author: Chuck Anderson <cra at wpi.edu>
Date:   Mon Aug 9 00:38:23 2010 -0400

    Merge branch 'master' into f14

 .gitignore |    3 +++
 ocp.spec   |   60 ++++++++++++++++++++++++++++++++++++++++++++++--------------
 sources    |    4 +++-
 3 files changed, 52 insertions(+), 15 deletions(-)
---