[activemq-cpp/el6/master: 5/5] Merge branch 'master' into el6

[stevetraylen]

commit 6d88550d309f8fb40541467ef97934063e3c2cc2
Merge: 4f5293b 088fd1e
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Tue Mar 8 18:32:01 2011 +0100

    Merge branch 'master' into el6

 .gitignore        |    2 ++
 activemq-cpp.spec |   16 +++++++++++-----
 sources           |    2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)
---