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

[Peter Robinson]

commit ef99d259c3047b67aab1735babb901a3792e73bf
Merge: 7322a29 80b2048
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Fri Mar 9 17:12:39 2012 +0000

    Merge branch 'master' into f16

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