[SCM] Packaging for gvl branch, master, updated. 636d9b91ba8119d27bcee38255ff5689c9a79590

[Martin Erik Werner]

The following commit has been merged in the master branch:
commit 9e841f93ab626c0591260dd4f1fb4ad62b92d84c
Merge: dad6679a5d008ef9742cd6df82da1f74f59feec9 57ba5195b6f1ea293c0fa8d40aa20e837132989d
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Tue Dec 20 20:05:31 2011 +0100

    Merge branch 'upstream'


-- 
Packaging for gvl