Merge Trond

diff --cc .bzrignore
index 55777a950e9a087fa15225b3a3d77f3d77b143b7,f6234cd126c5988752fc0bf035acdbc6f5391e1f..6c51079f387082ad688555fee37bb9b583341c7b
--- 1/.bzrignore
--- 2/.bzrignore
+++ b/.bzrignore
@@@ -163,11 -52,3 +52,7 @@@ tests/startserver
  tests/testapp
  tests/testplus
  tests/udptest
- lt~obsolete.m4
- ltoptions.m4
- ltsugar.m4
- ltversion.m4
- libtool.m4
- TAGS
- *TAGS
- *.lo
++libmemcached-0.30-1.src.rpm
++libmemcached-0.30-1.x86_64.rpm
++libmemcached-0.31-1.src.rpm
++libmemcached-0.31-1.x86_64.rpm