commit 3394d094e3e9f5aeeb256df209238586349b23bf Merge: f93e9ee dbef048 Author: Adam Williamson <awilliam at redhat.com> Date: Fri Mar 16 13:13:00 2012 -0700 Merge commit 'dbef048bc2d1c116af88b2884d637eb960dab711' grilo-plugins.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) ---