commit c1b792c27079de67c60765c6d309343537430ba8 Merge: 0a8b5b4 a0e2bc3 Author: Orion Poplawski <orion at cora.nwra.com> Date: Tue Jun 21 10:33:37 2011 -0600 Merge branch 'f15' into f14 .gitignore | 3 +++ nco.spec | 29 ++++++++++++++++++++++++----- sources | 2 +- 3 files changed, 28 insertions(+), 6 deletions(-) ---