Merge branch 'branch-2.5'master
commitb20614eed36ab0ab8ba95cccd3911bfc14505184
authorEric Blake <ebb9@byu.net>
Thu, 9 Apr 2009 04:09:37 +0000 (8 22:09 -0600)
committerEric Blake <ebb9@byu.net>
Thu, 9 Apr 2009 04:09:37 +0000 (8 22:09 -0600)
treee773764529cdebb54c8bcd3b4a2a0e7c26c8fade
parentbae076e9b2e420585c9ab85d1cfaaba5567b8e66
parentfda2838fd5efae19a8fa4210cc20068060e8d852
Merge branch 'branch-2.5'
ChangeLog