[rubygem-ruby-ole/el5: 3/3] Merge branch 'master' into el5

[Michael Stahnke]

commit b077a5b61d07e89d20f611e6528b307aaacef98a
Merge: d26728c 6d7f6a7
Author: Michael Stahnke <stahnma at puppetlabs.com>
Date:   Sun Jan 8 12:21:08 2012 -0600

    Merge branch 'master' into el5

 .gitignore            |    1 +
 rubygem-ruby-ole.spec |   13 ++++++++++---
 sources               |    2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)
---