- 
Committer:
Aaron Bentley
- 
Date:
2007-03-16 15:14:40 UTC
- 
mto:
This revision was merged to the branch mainline in
revision
2389.
- 
Revision ID:
abentley@panoramicfeedback.com-20070316151440-kwqaumvxjcyiurv2
Change bundle reader and merge directive to both be 'mergeables'