Merged in all tags, to unite development history

Merge commit 'v2.4.1';
      commit 'v2.5';
      commit 'v2.6.1';
      commit 'v2.6.2';
      commit 'cpp-rewrite-2006' into next
This commit is contained in:
John Wiegley 2009-11-30 16:27:48 -05:00

Diff content is not available