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

[Xavier Bachelot]

commit 0246eb76ff152a284b5899d05d7ae3d28b3d233b
Merge: bd07a75 31bb175
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Wed Jan 26 00:39:48 2011 +0100

    Merge branch 'master' into f14

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