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

[Steffen Moeller]

The following commit has been merged in the master branch:
commit 0dbe0657a8c9ded151db45349078fc7becda18e9
Merge: 2c821b52a8cc698276e722db64fe0e9bd5635bc4 310a59eff9161201773cb8b695e3e49d720df77a
Author: Steffen Moeller <moeller at debian.org>
Date:   Fri Feb 3 21:41:39 2012 +0100

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


-- 
BOINC packaging