[pLog-svn] Which one should I use?

[Oscar Renalias]

>
>> - In case you were wondering,  regarding merging 1.0.2 with 1.1, all
>> we need to do in the future is merge only branches/plog-1.0.2 from
>> revision 2xxx onwards, so that we don't merge the same stuff twice.
>>
>     Yes.  I was thinking about whether it would be easier to merge  
> more often, rather than one huge merge every six months?  It seems  
> like it would be less of a monster, if we had little increments.

yes, this sounds like a reasonable idea... We should keep it in mind  
for the next branch!

Oscar