Merge changes I4e32a8fb,Ic6a9d4c5
authorJohn Koleszar <jkoleszar@google.com>
Thu, 31 Mar 2011 13:21:11 +0000 (06:21 -0700)
committerCode Review <code-review@webmproject.org>
Thu, 31 Mar 2011 13:21:11 +0000 (06:21 -0700)
* changes:
  Generate a vpx.pc file for pkg-config.
  Export the version string as a makefile variable.


Trivial merge