[ykclient/el5: 12/12] Merge branch 'master' into el5

[Dennis Gilmore]

commit 2b765bd03e7cceaf0fbeacb70ec9a6ecc70010d2
Merge: d8b1971 f103022
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Mon Nov 7 08:35:19 2011 -0600

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	sources
    	ykclient.spec

 sources       |    2 +-
 ykclient.spec |   14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)
---