Changelog: Fix merge bit.
authorBenjamin Kosnik <bkoz@gcc.gnu.org>
Thu, 10 Apr 2008 20:28:38 +0000 (20:28 +0000)
committerBenjamin Kosnik <bkoz@gcc.gnu.org>
Thu, 10 Apr 2008 20:28:38 +0000 (20:28 +0000)
commit00bf373b67991459464d24c5bc7d7dafc157a364
tree37282f1a4abfc4197df28feaa462aa756422948c
parentd466a7e21c61360550e04a66dcd2cacd5172d672
Changelog: Fix merge bit.

2008-04-10  Benjamin Kosnik  <bkoz@redhat.com>

* Changelog: Fix merge bit.

From-SVN: r134175
libstdc++-v3/ChangeLog