[GMT: 2/2] fix merge from f17

[Peter Robinson]

commit aae7bf515534171db531d5214df9e5f5ba38e946
Merge: 4699db9 38546c8
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Oct 20 18:38:29 2012 +0100

    fix merge from f17

 .gitignore |   14 +-------------
 GMT.spec   |   12 +++++-------
 sources    |    2 +-
 3 files changed, 7 insertions(+), 21 deletions(-)
---
diff --cc .gitignore
index 14ed9b3,42ad121..83e3b5a
--- a/.gitignore
+++ b/.gitignore
@@@ -1,13 -1,14 +1,1 @@@
--GMT4.5.3_doc.tar.bz2
--GMT4.5.3_share.tar.bz2
--GMT4.5.3_src.tar.bz2
--GMT4.5.3_suppl.tar.bz2
--/GMT4.5.5_doc.tar.bz2
--/GMT4.5.5_share.tar.bz2
--/GMT4.5.5_src.tar.bz2
--/GMT4.5.5_suppl.tar.bz2
--/GMT4.5.6_doc.tar.bz2
--/GMT4.5.6_share.tar.bz2
--/GMT4.5.6_src.tar.bz2
--/GMT4.5.6_suppl.tar.bz2
--/gmt-4.5.7-notriangle.tar.bz2
 -/gmt-4.5.8.tar.bz2
++/gmt-*.tar.bz2