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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 36dfc137d5181a125b0db81d389e9e7e4cc1de97
Merge: 8c92f8c2f5cc23c80249fe852c405713da81bd98 e88d90afde6a8fc6f19cf4024cff4d645acb2d08
Author: Steffen Moeller <moeller at debian.org>
Date:   Fri Dec 2 03:27:51 2011 +0100

    Merge commit 'upstream/7.0.2+dfsg'
    
    Conflicts:
    	version.h


-- 
BOINC packaging