source versioning question

[Noah Watkins]

What is the relation between the current trunk and branch-0.22? Is trunk the 
current dev for 0.23 or 0.22?

Thanks,
Noah