Merge remote branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 May 2011 02:28:12 +0000 (04:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 May 2011 02:28:23 +0000 (04:28 +0200)
* qatar/master:
  configure: warn if pkg-config is missing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure

diff --cc configure
Simple merge