[libbluray/f14/master: 4/4] Merge branch 'master' into f14

[Xavier Bachelot]

commit bc462b1164126b6f7c81f8b080bd631082f24e4d
Merge: 0246eb7 4833b85
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Wed Jan 26 23:37:59 2011 +0100

    Merge branch 'master' into f14

 libbluray.spec |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)
---