[vsipl++] patch: fix merge conflicts

[Assem Salama]

Stefan Seefeld wrote:

>The attached patch fixes some conflicts seemingly introduced by two overlapping
>patches / commits last week.
>
>(Assem: please be careful when applying 'svn resolved'. There were some artifacts
>(such as "<<<< .mine") as well as conflicting code checked in with the last commit.)
>  
>
Sorry about that. I actually fixed this same file yesterday but didn't 
get arround to generating a patch.

Thanks,
Assem