From: Yves-Alexis Perez <corsac@debian.org>
Date: Mon, 31 Jan 2011 07:08:02 +0000 (+0100)
Subject: Merge branch 'upstream-unstable'
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e51eca351fb5cec63c0872cd35a1c06e155a76e0;p=midori

Merge branch 'upstream-unstable'
---

e51eca351fb5cec63c0872cd35a1c06e155a76e0
diff --cc data/search
index 2cd3cbc5,e7596424..59341ee1
--- a/data/search
+++ b/data/search
@@@ -24,19 -26,4 +26,18 @@@ token=w
  name=The Free Dictionary
  text=Dictionary, Encyclopedia and Thesaurus
  uri=http://www.thefreedictionary.com/%s
- icon=
  token=fd
 +
 +[Debian Packages]
 +name=Debian Packages
 +text=Search Debian Packages
 +uri=http://packages.debian.org/%s
 +icon=
 +token=d
 +
 +[Debian Bugs]
 +name=Debian Bugs
 +text=Debian Bugs Search
 +uri=http://bugs.debian.org/%s
 +icon=
 +token=dbs