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

[derks]

commit ee02a1100ed55c36e21a928ebe75853581c11f86
Merge: 0b06af2 b635ccb
Author: BJ Dierkes <wdierkes at 5dollarwhitebox.org>
Date:   Thu Jan 13 17:29:32 2011 -0600

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

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