[SCM] knights packaging branch, master, updated. upstream/2.2.0-33-g3a151ed

Tue May 24 21:06:06 UTC 2011

The following commit has been merged in the master branch:
commit 3a151ed7816b1a35b43e41c44e643c4ab9223a4d
Merge: bc00ee8db484c9b778002dea29d57d8891107d34 b115a75b0f623b6add007200d251bafd76b625c2
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Tue May 24 23:06:47 2011 +0200

    Merge branch 'tmp'
    
    Conflicts:
    	debian/changelog

-- 
knights packaging