Merge branch 'search-3.2.0' of git.rot13.org:/git/BackupPC into search-3.2.0
authorDobrica Pavlinusic <dpavlin@rot13.org>
Mon, 7 Feb 2011 10:53:32 +0000 (10:53 +0000)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Mon, 7 Feb 2011 10:53:32 +0000 (10:53 +0000)

Trivial merge