GNU C Library master sources branch, master, updated. glibc-2.12-220-geaca756

Mon Nov 22 16:57:00 GMT 2010

  Hi!

  Thanks for checking this in!

On Mon, Nov 22, 2010 at 04:16:17PM -0000, drepper@sourceware.org wrote:
>     Conflicts:
>     
>     	ChangeLog

  To avoid ChangeLog conflicts when cherry-picking and merging, you
might find it useful to take a look at the git-merge-changelog merge
driver, as described in

	http://sourceware.org/glibc/wiki/GlibcGit#ChangeLog

				Petr "Pasky" Baudis