[media-explorer/f16: 3/3] Merge branch 'master' into f16

[Peter Robinson]

commit 31631bd3cd3bf5f79197eeb42e98f7325b83ffa0
Merge: ef99d25 af86296
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Mar 31 01:20:47 2012 +0100

    Merge branch 'master' into f16

 media-explorer.spec |    8 +++++++-
 sources             |    2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)
---