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

[Xavier Bachelot]

commit bd07a752fb4df9134502c344e22df7a71f0fcd51
Merge: 6838e22 1cfbd4e
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Fri Jan 7 14:12:03 2011 +0100

    Merge branch 'master' into f14
    
    Conflicts:
    	libbluray.spec

 .gitignore     |    1 +
 libbluray.spec |    6 +++---
 sources        |    2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)
---