[bind/f15: 2/2] Merge remote-tracking branch 'origin/master' into f15

[Adam Tkac]

commit 4b29c5f76ef71f282732ddeb4dc8d9b42ce3b8a4
Merge: 8ce4a64 7718233
Author: Adam Tkac <atkac at redhat.com>
Date:   Fri Sep 9 11:18:10 2011 +0200

    Merge remote-tracking branch 'origin/master' into f15

 .gitignore            |    1 +
 bind.spec             |   18 ++++++++++++++----
 bind98-rh735103.patch |   40 ++++++++++++++++++++++++++++++++++++++++
 sources               |    2 +-
 trusted-key.key       |    1 +
 5 files changed, 57 insertions(+), 5 deletions(-)
---