[libvpx/f14: 3/3] Merge branch 'f15' into f14

[Adam Jackson]

commit d8396ab23b279b638df2bc2a4c3e7a0a21ca76b9
Merge: fe2466d 68b3927
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Aug 16 15:41:40 2011 -0400

    Merge branch 'f15' into f14

 .gitignore  |    1 +
 libvpx.spec |   18 +++++++++++++-----
 sources     |    2 +-
 3 files changed, 15 insertions(+), 6 deletions(-)
---