Merge branch 'mi/264'
Conflicts: pyforge/pyforge/lib/search.py
Authored by: Max Ischenko 2010-04-22
Parent(s): [b1c007][c9fc29]
Child(ren): [3ef058]
