Merge branch 'm4-update' into branch-2.5branch-2.5
commitfda2838fd5efae19a8fa4210cc20068060e8d852
authorEric Blake <ebb9@byu.net>
Thu, 9 Apr 2009 04:07:04 +0000 (8 22:07 -0600)
committerEric Blake <ebb9@byu.net>
Thu, 9 Apr 2009 04:07:04 +0000 (8 22:07 -0600)
tree459be06be92ce52cbd09d50abb0e349939076c14
parentf03ce98e2e1f76c3fcfd5ac4d55c0eb950415dba
parentab3a683f0560e4ec24a06754386ee8c76da6ef67
Merge branch 'm4-update' into branch-2.5
ChangeLog