[player/f16: 3/3] Merge branch 'master' into f16

[Rex Dieter]

commit 1286ef10c83ac330417c6df4a7cbb2e767035783
Merge: bfaa53e 5558c5c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Aug 31 08:36:13 2011 -0500

    Merge branch 'master' into f16
    
    Conflicts:
    	player.spec

 player.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---