commit 97a3e5c464cd57795277d3ffea857455fd6345fe Merge: c2a391c 5a86b21 Author: Dan Horák <dan at danny.cz> Date: Mon Oct 10 12:29:11 2011 +0200 Merge branch 'master' into f14 libvpx.spec | 26 ++++++++++++++------------ 1 files changed, 14 insertions(+), 12 deletions(-) ---