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

[derks]

commit dfe9e82a3040ae4e516631010152b4cbaad4f70e
Merge: f388330 eee7615
Author: BJ Dierkes <wdierkes at 5dollarwhitebox.org>
Date:   Mon Jan 24 12:05:30 2011 -0600

    Merge branches 'HEAD' and 'master' into f14

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