[ack/f13/master: 5/5] Merge branch 'f14' into f13

[Ian Burrell]

commit fcdf148204ea0ee35efcb5bf613d6bf4f57bb6fb
Merge: 3577ff2 f10719c
Author: Ian Burrell <imb at rentrak.com>
Date:   Thu Sep 2 20:53:06 2010 -0700

    Merge branch 'f14' into f13
    
    Conflicts:
    	.gitignore

 ack.spec |   14 +++++++++++---
 sources  |    2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)
---