[iwhd/f17: 5/5] merge from master for iwhd-1.5

[Jim Meyering]

commit c899cdb4dd667bf5d0edf48d6584ce392cd61883
Merge: cbfd92b 81c3ff5
Author: Jim Meyering <meyering at redhat.com>
Date:   Mon Mar 12 14:13:48 2012 +0100

    merge from master for iwhd-1.5

 .gitignore |    1 +
 iwhd.spec  |    9 ++++-----
 sources    |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --cc iwhd.spec
index 4117529,b952df3..2ce807a
--- a/iwhd.spec
+++ b/iwhd.spec
@@@ -84,8 -80,9 +80,11 @@@ rm -rf %{buildroot
  %endif
  
  %changelog
 -* Sat Mar 10 2012 Jim Meyering <meyering at redhat.com> - 1.5-1
 -* Tue Mar  6 2012 Jim Meyering <meyering at redhat.com> - 1.4-1
 -- use just-released upstream iwhd-1.4
++* Mon Mar 12 2012 Jim Meyering <meyering at redhat.com> - 1.5-1
++- new release
++
 +* Mon Mar  5 2012 Jim Meyering <meyering at redhat.com> - 1.4-1
 +- use just-released upstream iwhd-1.4, but disable the pesky t/auto test
  - also add systemd-f16-vs-f17.patch
  
  * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-2