Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Jun 2014 23:38:44 +0000 (01:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 15 Jun 2014 23:38:48 +0000 (01:38 +0200)
* cehoyos/master:
  Do not suggest to use gas-preprocessor on aix where it doesn't work.

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

Trivial merge