Merge branch 'branch-2.5'
commit317b96ddebf7c2de5bbba77d5a4a640454779aaa
authorEric Blake <ebb9@byu.net>
Thu, 9 Apr 2009 03:03:48 +0000 (8 21:03 -0600)
committerEric Blake <ebb9@byu.net>
Thu, 9 Apr 2009 03:03:48 +0000 (8 21:03 -0600)
tree1c0dad6a774cdfed1831a878203e288255c4c46d
parent50cca368254281dccdfbb3ff6feaaa69760069d3
parent4ecd3681992375013c8e8f532a5463eb17781424
Merge branch 'branch-2.5'