[dnssec-system-tray/el6: 7/7] Merge branch 'master' into el6

[Wes Hardaker]

commit a92a4054f53ab19d1bd56a35d6abb9cf3d777b9b
Merge: 4164552 a4719e9
Author: Wes Hardaker <opensource at hardakers.net>
Date:   Fri Jun 22 07:55:39 2012 -0700

    Merge branch 'master' into el6

 .gitignore              |    2 ++
 dnssec-system-tray.spec |   11 ++++++++++-
 sources                 |    2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
---