[idm-console-framework/f13/master: 6/6] Merge branch 'f14' into f13

[Richard Allen Megginson]

commit e589cca4817420563b56807d6ec05f76b9adff28
Merge: bb9b908 3883b87
Author: Rich Megginson <rmeggins at redhat.com>
Date:   Tue Mar 29 20:13:11 2011 -0600

    Merge branch 'f14' into f13
    
    Conflicts:
    	.gitignore
    	idm-console-framework.spec
    	sources

 .gitignore                 |    1 +
 idm-console-framework.spec |   10 +++++++++-
 sources                    |    2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)
---