[MERGE] Fix version in dev7 string

[Jelmer Vernooij]

On Thu, Jun 11, 2009 at 02:55:52AM -0400, Ian Clatworthy wrote:
> Ian Clatworthy has voted tweak.
> Status is now: Conditionally approved
> Comment:
> The fix to the (subtree) compatibility detection is really important - I  
> don't think we can upgrade from development6-rr to development7-rr or 2a  
> without it. Please add a test as John requested and land this ASAP.
The version string fix was merged earlier. 

I couldn't find the proper place to add a test for 
check_conversion_target, so I left that change alone for now. I won't
have time to look at this again before monday, if anybody else does,
feel free to do so.

Cheers,

Jelmer
-- 
Jelmer Vernooij <jelmer at samba.org> - http://jelmer.vernstok.nl/
 14:25:51 up 22 days, 14:13,  4 users,  load average: 0.11, 0.11, 0.09