[tor-commits] [arm/release] Merge release commit 'bcb4729'

[atagar at torproject.org]

commit 43656fe1228ecf1bdc0ffce792e32a98f14241ea
Merge: d1d54c0 bcb4729
Author: Damian Johnson <atagar at torproject.org>
Date:   Thu Apr 21 08:39:04 2011 -0700

    Merge release commit 'bcb4729'
    
    Conflicts:
    	ChangeLog
    	setup.py
    	src/version.py

 setup.py |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)