Viewing all changes in revision 34.
- Committer: Steve Beattie
- Date: 2009-06-17 07:53:43 UTC
- mfrom: (31.1.4 findconflicts)
- Revision ID: sbeattie@ubuntu.com-20090617075343-qj713j5zo1p4477w
Merge testcase fixes and __object_info fix from mvo's branch.
expand all
collapse all
added
removed
