Merge up trunk

diff --combined libmemcached/csl/parser.am
index 0000000000000000000000000000000000000000,b5f93c2f0a5e9504ca459fe3c7e8a2602d8af42d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
mode 000000,100644..100644
--- /dev/null
--- 2/libmemcached/csl/parser.am
+++ b/libmemcached/csl/parser.am
@@@ -1,0 -1,32 +1,0 @@@
 -# vim:ft=automake
 -#
 -#  Configure Scripting Language
 -#
 -#  Copyright (C) 2011 DataDifferental, http://datadifferential.com
 -#  
 -#  This program is free software: you can redistribute it and/or modify
 -#  it under the terms of the GNU Affero General Public License as
 -#  published by the Free Software Foundation, either version 3 of the
 -#  License, or (at your option) any later version.
 -#  
 -#  This program is distributed in the hope that it will be useful,
 -#  but WITHOUT ANY WARRANTY; without even the implied warranty of
 -#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 -#  GNU Affero General Public License for more details.
 -#  
 -#  You should have received a copy of the GNU Affero General Public License
 -#  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -
 -EXTRA_DIST+= \
 -           libmemcached/csl/parser.yy \
 -           libmemcached/csl/scanner.l
 -
 -libmemcached/csl/parser.h: libmemcached/csl/parser.cc
 -
 -libmemcached/csl/parser.cc: libmemcached/csl/parser.yy libmemcached/csl/scanner.l libmemcached/csl/scanner.h
 -      $(AM_V_YACC)$(am__skipyacc) $(YACC) $(YLFLAGS) $(AM_YFLAGS) -o $@ $<
 -
 -libmemcached/csl/scanner.h: libmemcached/csl/scanner.cc
 -
 -libmemcached/csl/scanner.cc: libmemcached/csl/scanner.l libmemcached/csl/parser.yy
 -      $(AM_V_GEN)$(LEX) $<