From: Mark Andrews Date: Wed, 4 Oct 2006 07:06:02 +0000 (+0000) Subject: update copyrights X-Git-Tag: v9.3.2-P2~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90fa77918c4cac1a16a93023334101f76c7895bc;p=thirdparty%2Fbind9.git update copyrights --- diff --git a/bin/named/query.c b/bin/named/query.c index b20324b3fd6..6533ce49360 100644 --- a/bin/named/query.c +++ b/bin/named/query.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: query.c,v 1.198.2.13.4.36.6.1 2006/08/17 07:12:31 marka Exp $ */ +/* $Id: query.c,v 1.198.2.13.4.36.6.2 2006/10/04 07:06:01 marka Exp $ */ #include diff --git a/bin/win32/BINDInstall/BINDInstallDlg.cpp b/bin/win32/BINDInstall/BINDInstallDlg.cpp index 1117571ef29..cc5adf4198c 100644 --- a/bin/win32/BINDInstall/BINDInstallDlg.cpp +++ b/bin/win32/BINDInstall/BINDInstallDlg.cpp @@ -1,5 +1,5 @@ /* - * Portions Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Portions Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") * Portions Copyright (C) 2001, 2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: BINDInstallDlg.cpp,v 1.6.2.6.2.12.6.1 2006/10/04 06:59:26 marka Exp $ */ +/* $Id: BINDInstallDlg.cpp,v 1.6.2.6.2.12.6.2 2006/10/04 07:06:02 marka Exp $ */ /* * Copyright (c) 1999-2000 by Nortel Networks Corporation diff --git a/config.h.win32 b/config.h.win32 index d7dbb10da64..5c5d3c43444 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2006 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2001 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: config.h.win32,v 1.6.12.5.16.1 2006/10/04 06:59:21 marka Exp $ */ +/* $Id: config.h.win32,v 1.6.12.5.16.2 2006/10/04 07:06:01 marka Exp $ */ /* * win32 configuration file diff --git a/configure.in b/configure.in index 6964108322f..4f34145de4a 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -# Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1998-2003 Internet Software Consortium. # # Permission to use, copy, modify, and distribute this software for any @@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl esyscmd([sed "s/^/# /" COPYRIGHT])dnl AC_DIVERT_POP()dnl -AC_REVISION($Revision: 1.294.2.23.2.51.4.1 $) +AC_REVISION($Revision: 1.294.2.23.2.51.4.2 $) AC_INIT(lib/dns/name.c) AC_PREREQ(2.13) diff --git a/lib/dns/gen.c b/lib/dns/gen.c index ec1dd585851..8fedd5dace4 100644 --- a/lib/dns/gen.c +++ b/lib/dns/gen.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2006 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: gen.c,v 1.65.2.5.2.6.18.1 2006/10/04 06:59:26 marka Exp $ */ +/* $Id: gen.c,v 1.65.2.5.2.6.18.2 2006/10/04 07:06:02 marka Exp $ */ #include diff --git a/lib/dns/opensslrsa_link.c b/lib/dns/opensslrsa_link.c index 1faf27e27db..3a6d558d027 100644 --- a/lib/dns/opensslrsa_link.c +++ b/lib/dns/opensslrsa_link.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2006 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 2000-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -17,7 +17,7 @@ /* * Principal Author: Brian Wellington - * $Id: opensslrsa_link.c,v 1.1.4.1.10.1 2006/10/04 06:59:26 marka Exp $ + * $Id: opensslrsa_link.c,v 1.1.4.1.10.2 2006/10/04 07:06:02 marka Exp $ */ #ifdef OPENSSL diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c index 28779645a56..a5474f1ae02 100644 --- a/lib/dns/resolver.c +++ b/lib/dns/resolver.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2006 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: resolver.c,v 1.218.2.18.4.56.4.1 2006/08/17 07:12:31 marka Exp $ */ +/* $Id: resolver.c,v 1.218.2.18.4.56.4.2 2006/10/04 07:06:02 marka Exp $ */ #include diff --git a/util/copyrights b/util/copyrights index 263ab11335e..9923dd6475c 100644 --- a/util/copyrights +++ b/util/copyrights @@ -1,5 +1,5 @@ ./.cvsignore X 1999,2000,2001 -./CHANGES X 2000,2001,2005 +./CHANGES X 2000,2001,2005,2006 ./COPYRIGHT TXT 1996,1997,1998,1999,2000,2001,2002,2003,2004,2005 ./EXCLUDED X 2001 ./FAQ X 2000,2001,2002,2003,2004,2005 @@ -22,12 +22,14 @@ ./bin/check/named-checkzone.c C 1999,2000,2001,2002,2003,2004 ./bin/check/named-checkzone.docbook SGML 2000,2001,2002,2004,2005 ./bin/check/named-checkzone.html HTML DOCBOOK -./bin/check/win32/namedcheckconf.dsp X 2001 +./bin/check/win32/checktool.dsp X 2006 +./bin/check/win32/checktool.dsw X 2006 +./bin/check/win32/namedcheckconf.dsp X 2001,2006 ./bin/check/win32/namedcheckconf.dsw X 2001 -./bin/check/win32/namedcheckconf.mak X 2001 -./bin/check/win32/namedcheckzone.dsp X 2001 +./bin/check/win32/namedcheckconf.mak X 2001,2006 +./bin/check/win32/namedcheckzone.dsp X 2001,2006 ./bin/check/win32/namedcheckzone.dsw X 2001 -./bin/check/win32/namedcheckzone.mak X 2001 +./bin/check/win32/namedcheckzone.mak X 2001,2006 ./bin/dig/.cvsignore X 2000,2001 ./bin/dig/Makefile.in MAKE 2000,2001,2002,2004 ./bin/dig/dig.1 MAN DOCBOOK @@ -44,15 +46,17 @@ ./bin/dig/nslookup.c C 2000,2001,2002,2003,2004,2005 ./bin/dig/nslookup.docbook SGML 2004,2005 ./bin/dig/nslookup.html HTML DOCBOOK -./bin/dig/win32/dig.dsp X 2001 +./bin/dig/win32/dig.dsp X 2001,2006 ./bin/dig/win32/dig.dsw X 2001 -./bin/dig/win32/dig.mak X 2001 -./bin/dig/win32/host.dsp X 2001 +./bin/dig/win32/dig.mak X 2001,2006 +./bin/dig/win32/dighost.dsp X 2006 +./bin/dig/win32/dighost.dsw X 2006 +./bin/dig/win32/host.dsp X 2001,2006 ./bin/dig/win32/host.dsw X 2001 -./bin/dig/win32/host.mak X 2001 +./bin/dig/win32/host.mak X 2001,2006 ./bin/dig/win32/nslookup.dsp X 2001 ./bin/dig/win32/nslookup.dsw X 2001 -./bin/dig/win32/nslookup.mak X 2001 +./bin/dig/win32/nslookup.mak X 2001,2006 ./bin/dnssec/.cvsignore X 2000,2001 ./bin/dnssec/Makefile.in MAKE 2000,2001,2002,2004,2005 ./bin/dnssec/dnssec-keygen.8 MAN DOCBOOK @@ -65,14 +69,16 @@ ./bin/dnssec/dnssec-signzone.html HTML DOCBOOK ./bin/dnssec/dnssectool.c C 2000,2001,2003,2004,2005 ./bin/dnssec/dnssectool.h C 2000,2001,2003,2004 -./bin/dnssec/win32/keygen.dsp X 2001 +./bin/dnssec/win32/dnssectool.dsp X 2006 +./bin/dnssec/win32/dnssectool.dsw X 2006 +./bin/dnssec/win32/keygen.dsp X 2001,2006 ./bin/dnssec/win32/keygen.dsw X 2001 -./bin/dnssec/win32/keygen.mak X 2001 +./bin/dnssec/win32/keygen.mak X 2001,2006 ./bin/dnssec/win32/nsupdate.dsp X 2001 ./bin/dnssec/win32/nsupdate.dsw X 2001 -./bin/dnssec/win32/signzone.dsp X 2001 +./bin/dnssec/win32/signzone.dsp X 2001,2006 ./bin/dnssec/win32/signzone.dsw X 2001 -./bin/dnssec/win32/signzone.mak X 2001 +./bin/dnssec/win32/signzone.mak X 2001,2006 ./bin/named/.cvsignore X 1999,2000,2001 ./bin/named/Makefile.in MAKE 1998,1999,2000,2001,2002,2004 ./bin/named/aclconf.c C 1999,2000,2001,2002,2004,2005 @@ -131,7 +137,7 @@ ./bin/named/named.docbook SGML 2000,2001,2003,2004,2005 ./bin/named/named.html HTML DOCBOOK ./bin/named/notify.c C 1999,2000,2001,2002,2003,2004 -./bin/named/query.c C 1999,2000,2001,2002,2003,2004,2005 +./bin/named/query.c C 1999,2000,2001,2002,2003,2004,2005,2006 ./bin/named/server.c C 1999,2000,2001,2002,2003,2004,2005 ./bin/named/sortlist.c C 2000,2001,2004 ./bin/named/tkeyconf.c C 1999,2000,2001,2004 @@ -145,7 +151,7 @@ ./bin/named/win32/include/named/os.h C 1999,2000,2001,2002,2004 ./bin/named/win32/named.dsp X 2001 ./bin/named/win32/named.dsw X 2001 -./bin/named/win32/named.mak X 2001 +./bin/named/win32/named.mak X 2001,2006 ./bin/named/win32/ntservice.c C 1999,2000,2001,2002,2004 ./bin/named/win32/os.c C 1999,2000,2001,2002,2004,2005 ./bin/named/xfrout.c C 1999,2000,2001,2002,2003,2004,2005 @@ -158,7 +164,7 @@ ./bin/nsupdate/nsupdate.html HTML DOCBOOK ./bin/nsupdate/win32/nsupdate.dsp X 2001 ./bin/nsupdate/win32/nsupdate.dsw X 2001 -./bin/nsupdate/win32/nsupdate.mak X 2001 +./bin/nsupdate/win32/nsupdate.mak X 2001,2006 ./bin/rndc/.cvsignore X 2000,2001 ./bin/rndc/Makefile.in MAKE 2000,2001,2002,2004 ./bin/rndc/include/rndc/os.h C 2001,2004 @@ -179,13 +185,15 @@ ./bin/rndc/unix/os.c C 2001,2004 ./bin/rndc/util.c C 2000,2001,2004 ./bin/rndc/util.h C 2000,2001,2004 -./bin/rndc/win32/confgen.dsp X 2001 +./bin/rndc/win32/confgen.dsp X 2001,2006 ./bin/rndc/win32/confgen.dsw X 2001 -./bin/rndc/win32/confgen.mak X 2001 +./bin/rndc/win32/confgen.mak X 2001,2006 ./bin/rndc/win32/os.c C 2001,2004 -./bin/rndc/win32/rndc.dsp X 2001 +./bin/rndc/win32/rndc.dsp X 2001,2006 ./bin/rndc/win32/rndc.dsw X 2001 -./bin/rndc/win32/rndc.mak X 2001 +./bin/rndc/win32/rndc.mak X 2001,2006 +./bin/rndc/win32/rndcutil.dsp X 2006 +./bin/rndc/win32/rndcutil.dsw X 2006 ./bin/tests/.cvsignore X 1999,2000,2001 ./bin/tests/Kchild.example.+003+04017.key X 2000,2001 ./bin/tests/Kchild.example.+003+04017.private X 2000,2001 @@ -789,14 +797,14 @@ ./bin/win32/BINDInstall/BINDInstall.dsp X 2001 ./bin/win32/BINDInstall/BINDInstall.dsw X 2001 ./bin/win32/BINDInstall/BINDInstall.h C.PORTION 2001,2004 -./bin/win32/BINDInstall/BINDInstall.mak X 2001 +./bin/win32/BINDInstall/BINDInstall.mak X 2001,2006 ./bin/win32/BINDInstall/BINDInstall.rc X 2001,2005 -./bin/win32/BINDInstall/BINDInstallDlg.cpp C.PORTION 2001,2003,2004,2005 +./bin/win32/BINDInstall/BINDInstallDlg.cpp C.PORTION 2001,2003,2004,2005,2006 ./bin/win32/BINDInstall/BINDInstallDlg.h C.PORTION 2001,2004 ./bin/win32/BINDInstall/DirBrowse.cpp C.PORTION 2001,2004 ./bin/win32/BINDInstall/DirBrowse.h C.PORTION 2001,2004 ./bin/win32/BINDInstall/StdAfx.cpp X 2001 -./bin/win32/BINDInstall/StdAfx.h X 2001 +./bin/win32/BINDInstall/StdAfx.h X 2001,2006 ./bin/win32/BINDInstall/VersionInfo.cpp X 2001 ./bin/win32/BINDInstall/VersionInfo.h X 2001 ./bin/win32/BINDInstall/res/BINDInstall.ico X 2001 @@ -804,11 +812,11 @@ ./bin/win32/BINDInstall/resource.h X 2001,2005 ./config.guess X 1999,2000,2001 ./config.h.in X 1999,2000,2001,2005 -./config.h.win32 C 1999,2000,2001,2004 +./config.h.win32 C 1999,2000,2001,2004,2006 ./config.sub X 1999,2000,2001 ./config.threads.in X 2005 -./configure X 1998,1999,2000,2001,2005 -./configure.in SH 1998,1999,2000,2001,2002,2003,2004,2005 +./configure X 1998,1999,2000,2001,2005,2006 +./configure.in SH 1998,1999,2000,2001,2002,2003,2004,2005,2006 ./conftools/perllib/dnsconf/DNSConf-macros.h C 2000,2001,2004 ./conftools/perllib/dnsconf/DNSConf.i C 2000,2001,2004 ./conftools/perllib/dnsconf/Makefile.PL PERL 2000,2001,2004 @@ -1605,7 +1613,7 @@ ./lib/bind9/win32/libbind9.def X 2001 ./lib/bind9/win32/libbind9.dsp X 2001 ./lib/bind9/win32/libbind9.dsw X 2001 -./lib/bind9/win32/libbind9.mak X 2001 +./lib/bind9/win32/libbind9.mak X 2001,2006 ./lib/bind9/win32/version.c C 1998,1999,2000,2001,2004 ./lib/dns/.cvsignore X 1999,2000,2001 ./lib/dns/Makefile.in MAKE 1998,1999,2000,2001,2002,2003,2004 @@ -1633,7 +1641,7 @@ ./lib/dns/forward.c C 2000,2001,2004,2005 ./lib/dns/gen-unix.h C 1999,2000,2001,2004,2005 ./lib/dns/gen-win32.h C 1999,2000,2001,2004 -./lib/dns/gen.c C 1998,1999,2000,2001,2002,2003,2004 +./lib/dns/gen.c C 1998,1999,2000,2001,2002,2003,2004,2006 ./lib/dns/gssapi_link.c C 2000,2001,2002,2004 ./lib/dns/gssapictx.c C 2000,2001,2004 ./lib/dns/hmac_link.c C.NAI 1999,2000,2001,2002,2004 @@ -1730,7 +1738,7 @@ ./lib/dns/openssl_link.c C.NAI 1999,2000,2001,2002,2003,2004 ./lib/dns/openssldh_link.c C.NAI 1999,2000,2001,2002,2004 ./lib/dns/openssldsa_link.c C.NAI 1999,2000,2001,2002,2004 -./lib/dns/opensslrsa_link.c C 2000,2001,2002,2003,2004 +./lib/dns/opensslrsa_link.c C 2000,2001,2002,2003,2004,2006 ./lib/dns/order.c C 2002,2004 ./lib/dns/peer.c C 2000,2001,2003,2004 ./lib/dns/portlist.c C 2003,2004 @@ -1847,7 +1855,7 @@ ./lib/dns/rdatasetiter.c C 1999,2000,2001,2004 ./lib/dns/rdataslab.c C 1999,2000,2001,2002,2003,2004 ./lib/dns/request.c C 2000,2001,2002,2004 -./lib/dns/resolver.c C 1999,2000,2001,2002,2003,2004,2005 +./lib/dns/resolver.c C 1999,2000,2001,2002,2003,2004,2005,2006 ./lib/dns/result.c C 1998,1999,2000,2001,2002,2003,2004 ./lib/dns/rootns.c C 1999,2000,2001,2002,2004 ./lib/dns/sdb.c C 2000,2001,2003,2004 @@ -1866,11 +1874,11 @@ ./lib/dns/win32/DLLMain.c C 2001,2004 ./lib/dns/win32/gen.dsp X 2001 ./lib/dns/win32/gen.dsw X 2001 -./lib/dns/win32/gen.mak X 2001 +./lib/dns/win32/gen.mak X 2001,2006 ./lib/dns/win32/libdns.def X 2001 -./lib/dns/win32/libdns.dsp X 2001 +./lib/dns/win32/libdns.dsp X 2001,2006 ./lib/dns/win32/libdns.dsw X 2001 -./lib/dns/win32/libdns.mak X 2001 +./lib/dns/win32/libdns.mak X 2001,2006 ./lib/dns/win32/version.c C 1998,1999,2000,2001,2004 ./lib/dns/xfrin.c C 1999,2000,2001,2002,2003,2004,2005 ./lib/dns/zone.c C 1999,2000,2001,2002,2003,2004,2005 @@ -2105,10 +2113,10 @@ ./lib/isc/win32/libisc.def X 2001,2005 ./lib/isc/win32/libisc.dsp X 2001 ./lib/isc/win32/libisc.dsw X 2001 -./lib/isc/win32/libisc.mak X 2001 +./lib/isc/win32/libisc.mak X 2001,2006 ./lib/isc/win32/net.c C 1999,2000,2001,2002,2003,2004 ./lib/isc/win32/netdb.h C 2000,2001,2004 -./lib/isc/win32/ntgroups.c C 2001,2004 +./lib/isc/win32/ntgroups.c C 2001,2004,2006 ./lib/isc/win32/ntpaths.c C 2001,2004 ./lib/isc/win32/once.c C 1999,2000,2001,2004 ./lib/isc/win32/os.c C 2000,2001,2002,2004 @@ -2157,7 +2165,7 @@ ./lib/isccc/win32/libisccc.def X 2001 ./lib/isccc/win32/libisccc.dsp X 2001 ./lib/isccc/win32/libisccc.dsw X 2001 -./lib/isccc/win32/libisccc.mak X 2001 +./lib/isccc/win32/libisccc.mak X 2001,2006 ./lib/isccc/win32/version.c C 2001,2004 ./lib/isccfg/.cvsignore X 2001 ./lib/isccfg/Makefile.in MAKE 2001,2002,2003,2004 @@ -2179,7 +2187,7 @@ ./lib/isccfg/win32/libisccfg.def X 2001 ./lib/isccfg/win32/libisccfg.dsp X 2001 ./lib/isccfg/win32/libisccfg.dsw X 2001 -./lib/isccfg/win32/libisccfg.mak X 2001 +./lib/isccfg/win32/libisccfg.mak X 2001,2006 ./lib/isccfg/win32/version.c C 1998,1999,2000,2001,2004 ./lib/lwres/.cvsignore X 2000,2001 ./lib/lwres/Makefile.in MAKE 2000,2001,2004,2005 @@ -2301,7 +2309,7 @@ ./lib/lwres/win32/liblwres.def X 2001 ./lib/lwres/win32/liblwres.dsp X 2001 ./lib/lwres/win32/liblwres.dsw X 2001 -./lib/lwres/win32/liblwres.mak X 2001 +./lib/lwres/win32/liblwres.mak X 2001,2006 ./lib/lwres/win32/lwconfig.c C 2002,2004 ./lib/lwres/win32/version.c C 1998,1999,2000,2001,2004 ./lib/tests/.cvsignore X 1999,2000,2001 @@ -2316,7 +2324,7 @@ ./lib/win32/bindevt/bindevt.c C 2000,2001,2004 ./lib/win32/bindevt/bindevt.dsp X 2001 ./lib/win32/bindevt/bindevt.dsw X 2001 -./lib/win32/bindevt/bindevt.mak X 2001 +./lib/win32/bindevt/bindevt.mak X 2001,2006 ./lib/win32/bindevt/bindevt.mc MC 2001,2004 ./libtool.m4 X 2000,2001 ./ltmain.sh X 1999,2000,2001 @@ -2339,7 +2347,7 @@ ./util/check-instincludes.sh SH 2000,2001,2004 ./util/check-pullups.pl PERL 2001,2002,2003,2004 ./util/check-sources.pl PERL 2000,2001,2004 -./util/copyrights X 1999,2000,2001,2005 +./util/copyrights X 1999,2000,2001,2005,2006 ./util/kit.sh SH 2000,2001,2002,2003,2004 ./util/mandoc2docbook.pl PERL 2001,2004 ./util/mdnbuildtest.sh SH 2000,2001,2004 @@ -2351,12 +2359,13 @@ ./util/spacewhack.pl PERL 2000,2001,2004 ./util/update-drafts.pl PERL 2000,2001,2004 ./util/update_copyrights PERL 1998,1999,2000,2001,2004,2005 -./version X 1999,2000,2001,2005 -./win32utils/BINDBuild.dsw X 2001,2005 -./win32utils/BuildAll.bat BAT 2001,2002,2004 -./win32utils/BuildSetup.bat BAT 2001,2002,2004,2005 +./version X 1999,2000,2001,2005,2006 +./win32utils/BINDBuild.dsw X 2001,2005,2006 +./win32utils/BuildAll.bat BAT 2001,2002,2004,2006 +./win32utils/BuildSetup.bat BAT 2001,2002,2004,2005,2006 ./win32utils/dnsheadergen.bat BAT 2001,2004 ./win32utils/makedefs.pl PERL 2001,2004 ./win32utils/makeversion.pl PERL 2001,2004 ./win32utils/readme1st.txt TXT.BRIEF 2001,2003,2004,2005 +./win32utils/updateopenssl.pl PERL 2006 ./win32utils/win32-build.txt TXT.BRIEF 2001,2002,2004,2005