commit 1334480dc306064ecc7bf9adadec0afeac36b2cf Merge: 7b01d6c 9adaff9 Author: Tomas Touceda chiiph@gentoo.org Date: Thu May 5 15:55:52 2011 -0300

Merge branch 'bug2744_bandwidth'

src/vidalia/network/RouterDescriptorView.cpp | 5 ++++- src/vidalia/network/RouterListItem.cpp | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-)