commit 68b3927a11c59c336f14a22643e34cfa4a2abae6 Merge: b73891d 72dc4d9 Author: Adam Jackson <ajax at redhat.com> Date: Tue Aug 16 15:33:35 2011 -0400 Merge branch 'f16' into f15 .gitignore | 1 + libvpx.spec | 18 +++++++++++++----- sources | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-) ---