[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-388-gc7131be

[Steffen Moeller]

The following commit has been merged in the master branch:
commit c7131bef3c3cce00a867bc6343895dbf0047358d
Merge: 4fd006b630eb381015daac19407a4d1def6179bc 3fc182f88204d3605382c38d15e0e8e90238531b
Author: Steffen Moeller <moeller at debian.org>
Date:   Wed Feb 15 22:04:32 2012 +0100

    Merge branch 'upstream'
    
    Conflicts:
    	version.h


-- 
BOINC packaging