[dnstop/f15: 4/4] Merge 20110502 to F-15.

[konradm]

commit 38c13e4c67c9aa604f1bbbaafa5775941d9ac837
Merge: 20f2285 36cb7db
Author: Conrad Meyer <cemeyer at cs.washington.edu>
Date:   Sat Jul 16 13:11:10 2011 -0700

    Merge 20110502 to F-15.

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