[urg/el6/master: 4/4] Merge branch 'master' into el6

[Tim Niemueller]

commit 5c1cbf3ee4d719a0fb96e7331d8810f3146ee0ae
Merge: 5535a7b f93995c
Author: Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:   Sat Nov 6 15:46:53 2010 -0400

    Merge branch 'master' into el6
    
    Conflicts:
    	urg.spec

 .gitignore |    1 +
 urg.spec   |    5 ++++-
 2 files changed, 5 insertions(+), 1 deletions(-)
---
diff --cc .gitignore
index aba0ea1,aba0ea1..f5286bf
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,1 +1,2 @@@
  urg-0.8.7.zip
++/.build*