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

[Peter Robinson]

commit 7322a298c956d3bd33f148bcdaa37e51d59acbc5
Merge: a665045 efe9140
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Fri Feb 3 11:55:56 2012 +0000

    Merge branch 'master' into f16

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