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

[derks]

commit 43f805f8436f0b9af6ca21189eb7c7bd321b8445
Merge: 84cc34c b635ccb
Author: BJ Dierkes <wdierkes at 5dollarwhitebox.org>
Date:   Thu Jan 13 17:29:51 2011 -0600

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

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