Trivial merge.

diff --cc ChangeLog
index a0f9801fef2dada24d70a2e8c8fdd482d1088f46,3a357caff9594eee31caa6a93b79b4f8d53c5d7e..cd72866d2712f62574d3357cdad91901fa9341f0
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,23 -1,8 +1,28 @@@
 +2012-03-29  Niels Möller  <nisse@lysator.liu.se>
 +
 +      Implementation of Salsa20, contributed by Simon Josefsson.
 +      * salsa20.h: New file.
 +      * salsa20.c: New file.
 +      * Makefile.in (nettle_SOURCES): Added salsa20.c
 +      (HEADERS): Added salsa20.h.
 +      * testsuite/Makefile.in (TS_NETTLE_SOURCES): Added salsa20-test.c.
 +      * testsuite/salsa20-test.c: New test case.
 +
 +      * Makefile.in (soname links): Adding missing space before ].
 +
 +2012-03-23  Niels Möller  <nisse@lysator.liu.se>
 +
 +      * arcfour.h (arcfour_stream): Deleted obsolete prototype.
 +
 +2012-03-05  Niels Möller  <nisse@lysator.liu.se>
 +
 +      * configure.ac (enable_shared): Build shared libraries by default.
 +
+ 2012-03-04  Niels Möller  <nisse@lysator.liu.se>
+ 
+       * configure.ac (LIBNETTLE_MINOR): Bumped library version, to 4.4.
+       (LIBHOGWEED_MINOR): And to 2.2.
+ 
  2012-02-27  Niels Möller  <nisse@lysator.liu.se>
  
        * list-obj-sizes.awk: Recognize elf64 objects.

diff --cc configure.ac
Simple merge