[gdal/f21: 2/2] Merge branch 'master' into f21

[Dan Horák]

commit 11a448844a7ff3eb3f619c5411d8ab89a54a34e5
Merge: 41f3751 839254e
Author: Dan Horák <dan at danny.cz>
Date:   Fri Nov 14 12:19:53 2014 +0100

    Merge branch 'master' into f21

 gdal.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---