[holland/el5/master: 2/2] Merge branches 'HEAD' and 'master' into el5

[derks]

commit b22bdc9d841754b3f4abf0c6856e6ea833055bf5
Merge: ee02a11 eee7615
Author: BJ Dierkes <wdierkes at 5dollarwhitebox.org>
Date:   Mon Jan 24 12:03:51 2011 -0600

    Merge branches 'HEAD' and 'master' into el5

 holland-1.0.6-bug706997.patch |   23 +++++++++++++++++++++++
 holland.spec                  |   11 ++++++++++-
 2 files changed, 33 insertions(+), 1 deletions(-)
---