[rubygem-treetop/el6: 7/7] Merge branch 'master' into el6

[Michael Stahnke]

commit 59066084467dc5c9040e8dc4b3af5a93ce6cb12f
Merge: 7a0b433 4c48a14
Author: Michael Stahnke <stahnma at puppetlabs.com>
Date:   Sun Jan 8 13:10:24 2012 -0600

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore

 .gitignore                           |    2 +
 rubygem-treetop.spec                 |   37 +++++++++++++++++++++++++++------
 sources                              |    2 +-
 treetop-downgrade-polyglot-dep.patch |   27 ++++++++++++++++++++++++
 4 files changed, 60 insertions(+), 8 deletions(-)
---