Merge commit '7813e6752bdab38a5686c301e869ee71d97bce69'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 18 Nov 2014 19:33:37 +0000 (20:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 18 Nov 2014 19:33:37 +0000 (20:33 +0100)
* commit '7813e6752bdab38a5686c301e869ee71d97bce69':
  configure: Fix enabling memalign_hack automatically

Conflicts:
configure

See: 3d93ba562243b6d8afac3c875c05304d41da94bf
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge