[libvpx/f15: 2/2] Merge branch 'master' into f15

[Dan Horák]

commit cb220d5394058579726860c0199333b470aabf42
Merge: 4f3103f 5a86b21
Author: Dan Horák <dan at danny.cz>
Date:   Mon Oct 10 12:28:31 2011 +0200

    Merge branch 'master' into f15

 libvpx.spec |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)
---