From 10fcb8586ddcd42f7170564b7c3e255e7ee8a6ca Mon Sep 17 00:00:00 2001
From: Manuel Quiñones <manuq@laptop.org>
Date: Thu, 05 Jan 2012 12:30:45 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:browse/mainline

---
(limited to 'browser.py')

--
cgit v0.9.1