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

[Xavier Bachelot]

commit 6838e227af4d3c533fa82eefddce08990ca123a5
Merge: 00c0968 ce2fad0
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Fri Dec 24 00:02:36 2010 +0100

    Merge branch 'master' into f14

 libbluray.spec |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---