Merge commit '528878ee7b377e23a194d7c801571d97793047e0'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 24 Jan 2013 13:29:29 +0000 (14:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 24 Jan 2013 13:29:29 +0000 (14:29 +0100)
commit9c555bca68cf3f168c2e4ffcb5b4dacbda8366bf
tree1873b06aef23ed2fb27840bf1f2ef77ecbcde0a3
parentb4581e9394c9f97d08af814d09337ed16f21cfe0
parent528878ee7b377e23a194d7c801571d97793047e0
Merge commit '528878ee7b377e23a194d7c801571d97793047e0'

* commit '528878ee7b377e23a194d7c801571d97793047e0':
  openbsd: configure: Stop enabling PIC by default

Conflicts:
configure

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