commit 693d77bbcc109b00f623efbe4fc0f1d806f68de1 Merge: 17e4aae 6fee2c0 Author: Adam Williamson <awilliam at redhat.com> Date: Wed Nov 9 18:09:04 2011 -0800 Merge commit '6fee2c0914cbd281c3f8a0e8561a84d94cbea973' gupnp-av.spec | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) ---