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

[Adam Tkac]

commit b2905196570b9d9f75cdc4d51040856953886a03
Merge: c374d49 136022b
Author: Adam Tkac <atkac at redhat.com>
Date:   Fri May 27 10:25:34 2011 +0200

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

 .gitignore |    1 +
 bind.spec  |    7 +++++--
 sources    |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
---