[holland/el4/master: 2/2] Merge branch 'HEAD', remote branch 'origin/master' into el4

[derks]

commit dc4358447f0d447c9d93a02df6ecd7c6aee41d9f
Merge: a98b0b6 b635ccb
Author: BJ Dierkes <wdierkes at 5dollarwhitebox.org>
Date:   Thu Jan 13 17:29:11 2011 -0600

    Merge branch 'HEAD', remote branch 'origin/master' into el4

 holland.spec |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)
---