- Updated branch and tag for polarssl-0.13.0 to new default copyright header

diff --git a/include/polarssl/aes.h b/include/polarssl/aes.h
index 8268390..b8a358b 100644
--- a/include/polarssl/aes.h
+++ b/include/polarssl/aes.h
@@ -1,11 +1,9 @@
 /**
  * \file aes.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/arc4.h b/include/polarssl/arc4.h
index 14abe39..e903cca 100644
--- a/include/polarssl/arc4.h
+++ b/include/polarssl/arc4.h
@@ -1,11 +1,9 @@
 /**
  * \file arc4.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/base64.h b/include/polarssl/base64.h
index 6144184..bb1c236 100644
--- a/include/polarssl/base64.h
+++ b/include/polarssl/base64.h
@@ -1,11 +1,9 @@
 /**
  * \file base64.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/bignum.h b/include/polarssl/bignum.h
index f413512..2f8a75d 100644
--- a/include/polarssl/bignum.h
+++ b/include/polarssl/bignum.h
@@ -1,11 +1,9 @@
 /**
  * \file bignum.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/bn_mul.h b/include/polarssl/bn_mul.h
index 3eca5cc..4986b51 100644
--- a/include/polarssl/bn_mul.h
+++ b/include/polarssl/bn_mul.h
@@ -1,11 +1,9 @@
 /**
  * \file bn_mul.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/camellia.h b/include/polarssl/camellia.h
index ed05990..a989cf3 100644
--- a/include/polarssl/camellia.h
+++ b/include/polarssl/camellia.h
@@ -1,7 +1,7 @@
 /**
  * \file camellia.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/include/polarssl/certs.h b/include/polarssl/certs.h
index b982d7e..6760cdb 100644
--- a/include/polarssl/certs.h
+++ b/include/polarssl/certs.h
@@ -1,11 +1,9 @@
 /**
  * \file certs.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/config.h b/include/polarssl/config.h
index c09bca6..64ec89e 100644
--- a/include/polarssl/config.h
+++ b/include/polarssl/config.h
@@ -1,11 +1,9 @@
 /**
  * \file config.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/debug.h b/include/polarssl/debug.h
index 9bae627..aae0ecf 100644
--- a/include/polarssl/debug.h
+++ b/include/polarssl/debug.h
@@ -1,11 +1,9 @@
 /**
  * \file debug.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/des.h b/include/polarssl/des.h
index 04fdf67..172877e 100644
--- a/include/polarssl/des.h
+++ b/include/polarssl/des.h
@@ -1,11 +1,9 @@
 /**
  * \file des.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/dhm.h b/include/polarssl/dhm.h
index b6f3348..7032242 100644
--- a/include/polarssl/dhm.h
+++ b/include/polarssl/dhm.h
@@ -1,11 +1,9 @@
 /**
  * \file dhm.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/havege.h b/include/polarssl/havege.h
index ea355b9..08fdd65 100644
--- a/include/polarssl/havege.h
+++ b/include/polarssl/havege.h
@@ -1,11 +1,9 @@
 /**
  * \file havege.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/md2.h b/include/polarssl/md2.h
index 71040eb..15b5882 100644
--- a/include/polarssl/md2.h
+++ b/include/polarssl/md2.h
@@ -1,11 +1,9 @@
 /**
  * \file md2.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/md4.h b/include/polarssl/md4.h
index 24b90ec..5ceb2c6 100644
--- a/include/polarssl/md4.h
+++ b/include/polarssl/md4.h
@@ -1,11 +1,9 @@
 /**
  * \file md4.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/md5.h b/include/polarssl/md5.h
index ac28a0b..aaf9b58 100644
--- a/include/polarssl/md5.h
+++ b/include/polarssl/md5.h
@@ -1,11 +1,9 @@
 /**
  * \file md5.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/net.h b/include/polarssl/net.h
index 8a5fc4e..80ee8bf 100644
--- a/include/polarssl/net.h
+++ b/include/polarssl/net.h
@@ -1,11 +1,9 @@
 /**
  * \file net.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/openssl.h b/include/polarssl/openssl.h
index 6950384..3f0ea36 100644
--- a/include/polarssl/openssl.h
+++ b/include/polarssl/openssl.h
@@ -1,11 +1,9 @@
 /**
  * \file openssl.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/padlock.h b/include/polarssl/padlock.h
index cccc55d..8fb4e5c 100644
--- a/include/polarssl/padlock.h
+++ b/include/polarssl/padlock.h
@@ -1,11 +1,9 @@
 /**
  * \file padlock.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/rsa.h b/include/polarssl/rsa.h
index e7ee76a..4219cbe 100644
--- a/include/polarssl/rsa.h
+++ b/include/polarssl/rsa.h
@@ -1,11 +1,9 @@
 /**
  * \file rsa.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/sha1.h b/include/polarssl/sha1.h
index 060f720..6c7a41f 100644
--- a/include/polarssl/sha1.h
+++ b/include/polarssl/sha1.h
@@ -1,11 +1,9 @@
 /**
  * \file sha1.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/sha2.h b/include/polarssl/sha2.h
index d9f3855..bc4713b 100644
--- a/include/polarssl/sha2.h
+++ b/include/polarssl/sha2.h
@@ -1,11 +1,9 @@
 /**
  * \file sha2.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/sha4.h b/include/polarssl/sha4.h
index eb35f04..c508964 100644
--- a/include/polarssl/sha4.h
+++ b/include/polarssl/sha4.h
@@ -1,11 +1,9 @@
 /**
  * \file sha4.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/ssl.h b/include/polarssl/ssl.h
index 6b2ee3c..649b547 100644
--- a/include/polarssl/ssl.h
+++ b/include/polarssl/ssl.h
@@ -1,11 +1,9 @@
 /**
  * \file ssl.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/timing.h b/include/polarssl/timing.h
index ef5066e..e0edcc5 100644
--- a/include/polarssl/timing.h
+++ b/include/polarssl/timing.h
@@ -1,11 +1,9 @@
 /**
  * \file timing.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/x509.h b/include/polarssl/x509.h
index 9e1d5d6..31b1122 100644
--- a/include/polarssl/x509.h
+++ b/include/polarssl/x509.h
@@ -1,11 +1,9 @@
 /**
  * \file x509.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/include/polarssl/xtea.h b/include/polarssl/xtea.h
index 21f0edf..c9c80c9 100644
--- a/include/polarssl/xtea.h
+++ b/include/polarssl/xtea.h
@@ -1,7 +1,7 @@
 /**
  * \file xtea.h
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/library/aes.c b/library/aes.c
index bf7b337..7e6357c 100644
--- a/library/aes.c
+++ b/library/aes.c
@@ -1,11 +1,9 @@
 /*
  *  FIPS-197 compliant AES implementation
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/library/arc4.c b/library/arc4.c
index b87053e..93ea4dc 100644
--- a/library/arc4.c
+++ b/library/arc4.c
@@ -1,11 +1,9 @@
 /*
  *  An implementation of the ARCFOUR algorithm
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/library/base64.c b/library/base64.c
index 6a6c3ae..221c4dd 100644
--- a/library/base64.c
+++ b/library/base64.c
@@ -1,11 +1,9 @@
 /*
  *  RFC 1521 base64 encoding/decoding
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/library/bignum.c b/library/bignum.c
index fa9f1f1..a82d874 100644
--- a/library/bignum.c
+++ b/library/bignum.c
@@ -1,11 +1,9 @@
 /*
  *  Multi-precision integer library
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/library/camellia.c b/library/camellia.c
index 7656084..bc619d8 100644
--- a/library/camellia.c
+++ b/library/camellia.c
@@ -1,7 +1,7 @@
 /*
  *  Camellia implementation
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/library/certs.c b/library/certs.c
index 5b66c86..a56a94f 100644
--- a/library/certs.c
+++ b/library/certs.c
@@ -1,11 +1,9 @@
 /*
  *  X.509 test certificates
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/library/debug.c b/library/debug.c
index 58bb816..6471706 100644
--- a/library/debug.c
+++ b/library/debug.c
@@ -1,11 +1,9 @@
 /*
  *  Debugging routines
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/library/des.c b/library/des.c
index d2f7662..7798821 100644
--- a/library/des.c
+++ b/library/des.c
@@ -1,11 +1,9 @@
 /*
  *  FIPS-46-3 compliant Triple-DES implementation
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/library/dhm.c b/library/dhm.c
index 04d1e9f..1f17909 100644
--- a/library/dhm.c
+++ b/library/dhm.c
@@ -1,11 +1,9 @@
 /*
  *  Diffie-Hellman-Merkle key exchange
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/library/havege.c b/library/havege.c
index 610f9c5..3d96d4d 100644
--- a/library/havege.c
+++ b/library/havege.c
@@ -1,11 +1,9 @@
 /*
  *  HAVEGE: HArdware Volatile Entropy Gathering and Expansion
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/library/md2.c b/library/md2.c
index 3a0d1f5..9186980 100644
--- a/library/md2.c
+++ b/library/md2.c
@@ -1,11 +1,9 @@
 /*
  *  RFC 1115/1319 compliant MD2 implementation
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/library/md4.c b/library/md4.c
index 564a7f9..f3d80d0 100644
--- a/library/md4.c
+++ b/library/md4.c
@@ -1,11 +1,9 @@
 /*
  *  RFC 1186/1320 compliant MD4 implementation
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/library/md5.c b/library/md5.c
index 5ab3383..7560371 100644
--- a/library/md5.c
+++ b/library/md5.c
@@ -1,11 +1,9 @@
 /*
  *  RFC 1321 compliant MD5 implementation
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/library/net.c b/library/net.c
index e3b1738..67b52a7 100644
--- a/library/net.c
+++ b/library/net.c
@@ -1,11 +1,9 @@
 /*
  *  TCP networking functions
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/library/padlock.c b/library/padlock.c
index 4c30ddd..76f1d07 100644
--- a/library/padlock.c
+++ b/library/padlock.c
@@ -1,11 +1,9 @@
 /*
  *  VIA PadLock support functions
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/library/rsa.c b/library/rsa.c
index 6fca27d..80e63d1 100644
--- a/library/rsa.c
+++ b/library/rsa.c
@@ -1,11 +1,9 @@
 /*
  *  The RSA public-key cryptosystem
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/library/sha1.c b/library/sha1.c
index 7f8ec63..0ebdc1e 100644
--- a/library/sha1.c
+++ b/library/sha1.c
@@ -1,11 +1,9 @@
 /*
  *  FIPS-180-1 compliant SHA-1 implementation
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/library/sha2.c b/library/sha2.c
index 8f920ce..f82a7ae 100644
--- a/library/sha2.c
+++ b/library/sha2.c
@@ -1,11 +1,9 @@
 /*
  *  FIPS-180-2 compliant SHA-256 implementation
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/library/sha4.c b/library/sha4.c
index 699cca7..c0cbd3d 100644
--- a/library/sha4.c
+++ b/library/sha4.c
@@ -1,11 +1,9 @@
 /*
  *  FIPS-180-2 compliant SHA-384/512 implementation
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index 5802fdc..31c41df 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -1,11 +1,9 @@
 /*
  *  SSLv3/TLSv1 client-side functions
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index aec33a2..6737545 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -1,11 +1,9 @@
 /*
  *  SSLv3/TLSv1 server-side functions
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 7335513..d5e1c27 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -1,11 +1,9 @@
 /*
  *  SSLv3/TLSv1 shared functions
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/library/timing.c b/library/timing.c
index 0b62b10..7bed3f6 100644
--- a/library/timing.c
+++ b/library/timing.c
@@ -1,11 +1,9 @@
 /*
  *  Portable interface to the CPU cycle counter
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/library/x509parse.c b/library/x509parse.c
index 3013e9b..c316c03 100644
--- a/library/x509parse.c
+++ b/library/x509parse.c
@@ -1,11 +1,9 @@
 /*
  *  X.509 certificate and private key decoding
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/library/xtea.c b/library/xtea.c
index f7df144..b47a8ed 100644
--- a/library/xtea.c
+++ b/library/xtea.c
@@ -1,7 +1,7 @@
 /*
  *  An 32-bit implementation of the XTEA algorithm
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/programs/aes/aescrypt2.c b/programs/aes/aescrypt2.c
index d5305c1..bc99860 100644
--- a/programs/aes/aescrypt2.c
+++ b/programs/aes/aescrypt2.c
@@ -1,11 +1,9 @@
 /*
  *  AES-256 file encryption program
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/programs/hash/hello.c b/programs/hash/hello.c
index 897cccc..2d98b63 100644
--- a/programs/hash/hello.c
+++ b/programs/hash/hello.c
@@ -1,11 +1,9 @@
 /*
  *  Classic "Hello, world" demonstration program
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/programs/hash/md5sum.c b/programs/hash/md5sum.c
index 5ae7a85..78a723b 100644
--- a/programs/hash/md5sum.c
+++ b/programs/hash/md5sum.c
@@ -1,11 +1,9 @@
 /*
  *  md5sum demonstration program
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/programs/hash/sha1sum.c b/programs/hash/sha1sum.c
index 3a4fdfb..6c8b5c3 100644
--- a/programs/hash/sha1sum.c
+++ b/programs/hash/sha1sum.c
@@ -1,11 +1,9 @@
 /*
  *  sha1sum demonstration program
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/programs/hash/sha2sum.c b/programs/hash/sha2sum.c
index 0ef84f2..083ab10 100644
--- a/programs/hash/sha2sum.c
+++ b/programs/hash/sha2sum.c
@@ -1,11 +1,9 @@
 /*
  *  sha2sum demonstration program
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/programs/pkey/dh_client.c b/programs/pkey/dh_client.c
index 599e806..40fee6e 100644
--- a/programs/pkey/dh_client.c
+++ b/programs/pkey/dh_client.c
@@ -1,11 +1,9 @@
 /*
  *  Diffie-Hellman-Merkle key exchange (client side)
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/programs/pkey/dh_genprime.c b/programs/pkey/dh_genprime.c
index cc02ea6..ad77051 100644
--- a/programs/pkey/dh_genprime.c
+++ b/programs/pkey/dh_genprime.c
@@ -1,11 +1,9 @@
 /*
  *  Diffie-Hellman-Merkle key exchange (prime generation)
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/programs/pkey/dh_server.c b/programs/pkey/dh_server.c
index abea373..2678176 100644
--- a/programs/pkey/dh_server.c
+++ b/programs/pkey/dh_server.c
@@ -1,11 +1,9 @@
 /*
  *  Diffie-Hellman-Merkle key exchange (server side)
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/programs/pkey/mpi_demo.c b/programs/pkey/mpi_demo.c
index f5b4524..e26e483 100644
--- a/programs/pkey/mpi_demo.c
+++ b/programs/pkey/mpi_demo.c
@@ -1,11 +1,9 @@
 /*
  *  Simple MPI demonstration program
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/programs/pkey/rsa_genkey.c b/programs/pkey/rsa_genkey.c
index d043321..179277e 100644
--- a/programs/pkey/rsa_genkey.c
+++ b/programs/pkey/rsa_genkey.c
@@ -1,11 +1,9 @@
 /*
  *  Example RSA key generation program
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/programs/pkey/rsa_sign.c b/programs/pkey/rsa_sign.c
index 6ccb001..87bacb8 100644
--- a/programs/pkey/rsa_sign.c
+++ b/programs/pkey/rsa_sign.c
@@ -1,11 +1,9 @@
 /*
  *  RSA/SHA-1 signature creation program
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/programs/pkey/rsa_verify.c b/programs/pkey/rsa_verify.c
index ee26694..30d4352 100644
--- a/programs/pkey/rsa_verify.c
+++ b/programs/pkey/rsa_verify.c
@@ -1,11 +1,9 @@
 /*
  *  RSA/SHA-1 signature verification program
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/programs/ssl/ssl_client1.c b/programs/ssl/ssl_client1.c
index 4366853..396ae63 100644
--- a/programs/ssl/ssl_client1.c
+++ b/programs/ssl/ssl_client1.c
@@ -1,11 +1,9 @@
 /*
  *  SSL client demonstration program
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c
index c869629..123029d 100644
--- a/programs/ssl/ssl_client2.c
+++ b/programs/ssl/ssl_client2.c
@@ -1,11 +1,9 @@
 /*
  *  SSL client with certificate authentication
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/programs/ssl/ssl_server.c b/programs/ssl/ssl_server.c
index e0af1b0..bc72459 100644
--- a/programs/ssl/ssl_server.c
+++ b/programs/ssl/ssl_server.c
@@ -1,11 +1,9 @@
 /*
  *  SSL server demonstration program
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c
index 922c5ec..88f0ae1 100644
--- a/programs/test/benchmark.c
+++ b/programs/test/benchmark.c
@@ -1,11 +1,9 @@
 /*
  *  Benchmark demonstration program
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/programs/test/selftest.c b/programs/test/selftest.c
index ae75430..67b24e6 100644
--- a/programs/test/selftest.c
+++ b/programs/test/selftest.c
@@ -1,11 +1,9 @@
 /*
  *  Self-test demonstration program
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/programs/test/ssl_cert_test.c b/programs/test/ssl_cert_test.c
index ce687d1..b5ed778 100644
--- a/programs/test/ssl_cert_test.c
+++ b/programs/test/ssl_cert_test.c
@@ -1,7 +1,7 @@
 /*
  *  SSL certificate functionality tests
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
diff --git a/programs/test/ssl_test.c b/programs/test/ssl_test.c
index f12c2e9..14b46f8 100644
--- a/programs/test/ssl_test.c
+++ b/programs/test/ssl_test.c
@@ -1,11 +1,9 @@
 /*
  *  SSL/TLS stress testing program
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
diff --git a/programs/x509/cert_app.c b/programs/x509/cert_app.c
index 1df5198..d924cb1 100644
--- a/programs/x509/cert_app.c
+++ b/programs/x509/cert_app.c
@@ -1,11 +1,9 @@
 /*
  *  Certificate reading application
  *
- *  Copyright (C) 2006-2009, Paul Bakker <polarssl_maintainer at polarssl.org>
+ *  Copyright (C) 2006-2010, Paul Bakker <polarssl_maintainer at polarssl.org>
  *  All rights reserved.
  *
- *  Joined copyright on original XySSL code with: Christophe Devine
- *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or