commit e470bcfaa60760b6797d36f39cbac2659707eeca Merge: 6d6c456 8d82df6 Author: Erinn Clark erinn@torproject.org Date: Sun Jan 16 14:27:46 2011 +0100

Merge branch 'master' of ssh://torgit/torbrowser

README.Linux | 8 ++++++-- build-scripts/linux.mk | 16 ++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-)