sr-dev May 2010

sr-dev@lists.kamailio.org

18 participants
140 discussions

[tracker] Comment added: acc report_ack doesn't work

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#74 - acc report_ack doesn't work User who did this - Savolainen Dmitri (snen) ---------- thanks ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=74#comment84 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 5 months

new developer access: Jon Bonilla

by Daniel-Constantin Mierla

Hello, lately, most of the bugs related to Debian packaging were filled by Jon Bonilla (Manwe), so the solution was to ask him to join and help to fix/improve the spec files. Jon has been around for quite some time, working with other SIP related projects as well. I am looking forward to his contributions to packaging system, part which was not much under focus lately, but needs to be brought up-to-date to ease the installation on various OSes. His commit id is: manwe Welcome Jon! Cheers, Daniel -- Daniel-Constantin Mierla Kamailio (OpenSER) Advanced Training Miami, Fl, USA - June 21-23, 2010 http://www.asipto.com/index.php/kamailio-advanced-training/

14 years, 5 months

git:kamailio_3.0: db_berkeley: get rid of compile warnings

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 31d63323511540f9510ad9b0c7967e2f79004917 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=31d6332… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun May 30 11:03:22 2010 +0200 db_berkeley: get rid of compile warnings (cherry picked from commit 8b506f7d9b8eba682d180e458b0e2a278053d29a) --- modules/db_berkeley/bdb_lib.c | 2 +- modules/db_berkeley/km_bdb_lib.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/db_berkeley/bdb_lib.c b/modules/db_berkeley/bdb_lib.c index 66a495b..422d7af 100644 --- a/modules/db_berkeley/bdb_lib.c +++ b/modules/db_berkeley/bdb_lib.c @@ -492,7 +492,7 @@ void bdblib_log(int op, bdb_db_p _db_p, bdb_table_p _tp, char* _msg, int len) puts(buf); if ((_tp->logflags & JLOG_SYSLOG) == JLOG_SYSLOG) - syslog(LOG_LOCAL6, buf); + syslog(LOG_LOCAL6, "%s", buf); if(_tp->fp) { diff --git a/modules/db_berkeley/km_bdb_lib.c b/modules/db_berkeley/km_bdb_lib.c index e1e2cf6..810c331 100644 --- a/modules/db_berkeley/km_bdb_lib.c +++ b/modules/db_berkeley/km_bdb_lib.c @@ -532,7 +532,7 @@ void km_bdblib_log(int op, table_p _tp, char* _msg, int len) puts(buf); if ((_tp->logflags & JLOG_SYSLOG) == JLOG_SYSLOG) - syslog(LOG_LOCAL6, buf); + syslog(LOG_LOCAL6, "%s", buf); if(_tp->fp) {

14 years, 5 months

git:kamailio_3.0: srdb1: updated entities.xml path in db schema

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: a71c4f22859c85eeca90890a9496398537cd006f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a71c4f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun May 30 11:34:47 2010 +0200 srdb1: updated entities.xml path in db schema (cherry picked from commit 387e7ec22e736d1ce51f5c12d9f4e8533ead8512) --- lib/srdb1/schema/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/srdb1/schema/Makefile b/lib/srdb1/schema/Makefile index d24223f..276ba16 100644 --- a/lib/srdb1/schema/Makefile +++ b/lib/srdb1/schema/Makefile @@ -166,7 +166,7 @@ docbook: echo " <!ENTITY `basename "$$FILE" | sed -e 's#_#-#g'` SYSTEM \""$$FILE"\">" >> "$(ROOT)/doc/databases/kamailio/tables.sgml" ; \ done ; \ #Include general documentation entities - echo " <!ENTITY % docentities SYSTEM \"../entities.xml\"> %docentities;" >> "$(ROOT)/doc/databases/kamailio/tables.sgml" ; \ + echo " <!ENTITY % docentities SYSTEM \"../../../docbook/entities.xml\"> %docentities;" >> "$(ROOT)/doc/databases/kamailio/tables.sgml" ; \ echo "]>" >> "$(ROOT)/doc/databases/kamailio/tables.sgml" # add bookinfo cat "$(ROOT)/doc/stylesheets/dbschema_k/bookinfo.xml" >> "$(ROOT)/doc/databases/kamailio/tables.sgml"

14 years, 5 months

Kamailio database tables documentation is not updated

by Iñaki Baz Castillo

Hi, the database schema for devel version is not updated. For example the LCR tables: http://kamailio.org/docs/db-tables/kamailio-db-devel.html#AEN2491 How is this page updated? Regards. -- Iñaki Baz Castillo <ibc(a)aliax.net>

14 years, 5 months

git:master: xcap_server: removed duplicated docs

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: aa5585bb26b9fc78e1c89501159d78413fd95fd8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aa5585b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun May 30 11:00:10 2010 +0200 xcap_server: removed duplicated docs --- modules_k/xcap_server/README | 43 +++++++--------------- modules_k/xcap_server/doc/xcap_server_admin.xml | 19 ---------- 2 files changed, 14 insertions(+), 48 deletions(-) diff --git a/modules_k/xcap_server/README b/modules_k/xcap_server/README index 4a07eef..3d482a7 100644 --- a/modules_k/xcap_server/README +++ b/modules_k/xcap_server/README @@ -28,8 +28,7 @@ Daniel-Constantin Mierla 3.1. db_url (string) 3.2. xcap_table (string) 3.3. xcap_root (str) - 3.4. xcap_root (str) - 3.5. buf_size (int) + 3.4. buf_size (int) 4. Exported Functions @@ -44,12 +43,11 @@ Daniel-Constantin Mierla 1.1. Set the “db_url” parameter 1.2. Set the “xcap_table” parameter 1.3. Set url_match parameter - 1.4. Set url_match parameter - 1.5. Set the “buf_size” parameter - 1.6. xcaps_put usage - 1.7. xcaps_get usage - 1.8. xcaps_del usage - 1.9. sample xcap server + 1.4. Set the “buf_size” parameter + 1.5. xcaps_put usage + 1.6. xcaps_get usage + 1.7. xcaps_del usage + 1.8. sample xcap server Chapter 1. Admin Guide @@ -66,8 +64,7 @@ Chapter 1. Admin Guide 3.1. db_url (string) 3.2. xcap_table (string) 3.3. xcap_root (str) - 3.4. xcap_root (str) - 3.5. buf_size (int) + 3.4. buf_size (int) 4. Exported Functions @@ -124,8 +121,7 @@ Chapter 1. Admin Guide 3.1. db_url (string) 3.2. xcap_table (string) 3.3. xcap_root (str) - 3.4. xcap_root (str) - 3.5. buf_size (int) + 3.4. buf_size (int) 3.1. db_url (string) @@ -160,24 +156,13 @@ modparam("xcap_server", "xcap_table", "xcapdocs") modparam("xcap_server", "xcap_root", "/xcap-root/") ... -3.4. xcap_root (str) - - XCAP root URL. - - Default value is '/xcap-root/'. - - Example 1.4. Set url_match parameter -... -modparam("xcap_server", "xcap_root", "/xcap-root/") -... - -3.5. buf_size (int) +3.4. buf_size (int) Size of local buffer for handling XCAP documents. Default value is “1024”. - Example 1.5. Set the “buf_size” parameter + Example 1.4. Set the “buf_size” parameter ... modparam("xcap_server", "buf_size", 2048) ... @@ -192,7 +177,7 @@ modparam("xcap_server", "buf_size", 2048) Handle XCAP PUT command. - Example 1.6. xcaps_put usage + Example 1.5. xcaps_put usage ... event_route[xhttp:request] { if($hu=~"^/xcap-root/") @@ -212,7 +197,7 @@ event_route[xhttp:request] { Handle XCAP GET command. - Example 1.7. xcaps_get usage + Example 1.6. xcaps_get usage ... event_route[xhttp:request] { if($hu=~"^/xcap-root/") @@ -232,7 +217,7 @@ event_route[xhttp:request] { Handle XCAP DELETE command. - Example 1.8. xcaps_del usage + Example 1.7. xcaps_del usage ... event_route[xhttp:request] { if($hu=~"^/xcap-root/") @@ -250,7 +235,7 @@ event_route[xhttp:request] { 5. Simple XCAP Server Config - Example 1.9. sample xcap server + Example 1.8. sample xcap server ... loadmodule "xhttp.so" loadmodule "xcap_server.so" diff --git a/modules_k/xcap_server/doc/xcap_server_admin.xml b/modules_k/xcap_server/doc/xcap_server_admin.xml index 09bc208..8d169d3 100644 --- a/modules_k/xcap_server/doc/xcap_server_admin.xml +++ b/modules_k/xcap_server/doc/xcap_server_admin.xml @@ -163,25 +163,6 @@ modparam("xcap_server", "xcap_root", "/xcap-root/") </example> </section> <section> - <title><varname>xcap_root</varname> (str)</title> - <para> - XCAP root URL. - </para> - <para> - <emphasis> - Default value is '/xcap-root/'. - </emphasis> - </para> - <example> - <title>Set <varname>url_match</varname> parameter</title> - <programlisting format="linespecific"> -... -modparam("xcap_server", "xcap_root", "/xcap-root/") -... -</programlisting> - </example> - </section> - <section> <title><varname>buf_size</varname> (int)</title> <para> Size of local buffer for handling XCAP documents.

14 years, 5 months

git:master: srdb1: updated entities.xml path in db schema

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 387e7ec22e736d1ce51f5c12d9f4e8533ead8512 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=387e7ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun May 30 11:34:47 2010 +0200 srdb1: updated entities.xml path in db schema --- lib/srdb1/schema/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/srdb1/schema/Makefile b/lib/srdb1/schema/Makefile index d24223f..276ba16 100644 --- a/lib/srdb1/schema/Makefile +++ b/lib/srdb1/schema/Makefile @@ -166,7 +166,7 @@ docbook: echo " <!ENTITY `basename "$$FILE" | sed -e 's#_#-#g'` SYSTEM \""$$FILE"\">" >> "$(ROOT)/doc/databases/kamailio/tables.sgml" ; \ done ; \ #Include general documentation entities - echo " <!ENTITY % docentities SYSTEM \"../entities.xml\"> %docentities;" >> "$(ROOT)/doc/databases/kamailio/tables.sgml" ; \ + echo " <!ENTITY % docentities SYSTEM \"../../../docbook/entities.xml\"> %docentities;" >> "$(ROOT)/doc/databases/kamailio/tables.sgml" ; \ echo "]>" >> "$(ROOT)/doc/databases/kamailio/tables.sgml" # add bookinfo cat "$(ROOT)/doc/stylesheets/dbschema_k/bookinfo.xml" >> "$(ROOT)/doc/databases/kamailio/tables.sgml"

14 years, 5 months

git:master: db_berkeley: get rid of compile warnings

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 8b506f7d9b8eba682d180e458b0e2a278053d29a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8b506f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun May 30 11:03:22 2010 +0200 db_berkeley: get rid of compile warnings --- modules/db_berkeley/bdb_lib.c | 2 +- modules/db_berkeley/km_bdb_lib.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/db_berkeley/bdb_lib.c b/modules/db_berkeley/bdb_lib.c index 0c3b6df..910ef3e 100644 --- a/modules/db_berkeley/bdb_lib.c +++ b/modules/db_berkeley/bdb_lib.c @@ -499,7 +499,7 @@ void bdblib_log(int op, bdb_db_p _db_p, bdb_table_p _tp, char* _msg, int len) puts(buf); if ((_tp->logflags & JLOG_SYSLOG) == JLOG_SYSLOG) - syslog(LOG_LOCAL6, buf); + syslog(LOG_LOCAL6, "%s", buf); if(_tp->fp) { diff --git a/modules/db_berkeley/km_bdb_lib.c b/modules/db_berkeley/km_bdb_lib.c index 90dacaf..0c53664 100644 --- a/modules/db_berkeley/km_bdb_lib.c +++ b/modules/db_berkeley/km_bdb_lib.c @@ -539,7 +539,7 @@ void km_bdblib_log(int op, table_p _tp, char* _msg, int len) puts(buf); if ((_tp->logflags & JLOG_SYSLOG) == JLOG_SYSLOG) - syslog(LOG_LOCAL6, buf); + syslog(LOG_LOCAL6, "%s", buf); if(_tp->fp) {

14 years, 5 months

git:kamailio_3.0: pkg Changes to debian/control

by Jon Bonilla

Module: sip-router Branch: kamailio_3.0 Commit: e0eeace9b3c0c90d390bba63dee6d161c3f34d40 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e0eeace… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Committer: Jon Bonilla <manwe(a)aholab.ehu.es> Date: Sat May 29 22:13:26 2010 +0200 pkg Changes to debian/control - Dependency changes to match lenny and squeeze at least. This will allow to drop debian-lenny folder in the future. - Added "Replaces" to kamailio-*-modules since the name of the modules has changed since kamailio-1.5 and the upgrade would not work properly. - VCS lines erased since the pointed to wrong URLs and we do not have a 3.0.2 tag to point. - Added "Conflicts" to erase old packages that do not exist in this version and could cause upgrade not to work properly. --- pkg/kamailio/debian/control | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pkg/kamailio/debian/control b/pkg/kamailio/debian/control index d3ef1b5..14f159c 100644 --- a/pkg/kamailio/debian/control +++ b/pkg/kamailio/debian/control @@ -3,15 +3,14 @@ Section: net Priority: optional Maintainer: Debian VoIP Team <pkg-voip-maintainers(a)lists.alioth.debian.org> Uploaders: Kilian Krause <kilian(a)debian.org> -Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev | libmysqlclient16-dev | libmysqlclient15-dev | libmysqlclient14-dev | libmysqlclient12-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl4-openssl-dev, python, libpcre3-dev, docbook-xml, libpurple-dev, libmemcache-dev, libreadline5-dev +Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libpurple-dev, libmemcache-dev, libreadline5-dev Standards-Version: 3.8.0 Homepage: http://www.kamailio.org/ -Vcs-Svn: svn://svn.debian.org/pkg-voip/kamailio/trunk/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/kamailio/?op=log Package: kamailio Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, adduser +Conflicts: kamailio-regex-modules, kamailio-dbg Suggests: kamailio-mysql-modules, kamailio-postgres-modules, kamailio-unixodbc-modules, kamailio-tls-modules, kamailio-cpl-modules, kamailio-radius-modules, kamailio-presence-modules, kamailio-xmlrpc-modules, kamailio-perl-modules, kamailio-snmpstats-modules, kamailio-xmpp-modules, kamailio-carrierroute-modules, kamailio-berkeley-modules, kamailio-ldap-modules Description: very fast and configurable SIP proxy Kamailio is a very fast and flexible SIP (RFC3261) @@ -30,9 +29,11 @@ Description: very fast and configurable SIP proxy This package contains the main Kamailio binary along with the principal modules and support binaries. + Package: kamailio-mysql-modules Architecture: any Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), mysql-client +Replaces: kamailio-mysql-module Description: MySQL database connectivity module for Kamailio Kamailio is a very fast and flexible SIP (RFC3261) proxy server. Written entirely in C, Kamailio can handle thousands calls @@ -43,6 +44,7 @@ Description: MySQL database connectivity module for Kamailio Package: kamailio-postgres-modules Architecture: any Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), postgresql-client +Replaces: kamailio-postgres-module Description: PostgreSQL database connectivity module for Kamailio Kamailio is a very fast and flexible SIP (RFC3261) proxy server. Written entirely in C, Kamailio can handle thousands calls @@ -53,6 +55,7 @@ Description: PostgreSQL database connectivity module for Kamailio Package: kamailio-cpl-modules Architecture: any Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}) +Replaces: kamailio-cpl-module Description: CPL module (CPL interpreter engine) for Kamailio Kamailio is a very fast and flexible SIP (RFC3261) proxy server. Written entirely in C, Kamailio can handle thousands calls @@ -76,6 +79,7 @@ Description: radius modules for Kamailio Package: kamailio-unixodbc-modules Architecture: any Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}) +Replaces: kamailio-unixodbc-module Description: unixODBC database connectivity module for Kamailio Kamailio is a very fast and flexible SIP (RFC3261) proxy server. Written entirely in C, Kamailio can handle thousands calls @@ -98,6 +102,7 @@ Description: SIMPLE presence modules for Kamailio Package: kamailio-xmlrpc-modules Architecture: any Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}) +Replaces: kamailio-xmlrpc-module Description: XMLRPC support for Kamailio's Management Interface Kamailio is a very fast and flexible SIP (RFC3261) proxy server. Written entirely in C, Kamailio can handle thousands calls @@ -122,6 +127,7 @@ Description: Perl extensions and database driver for Kamailio Package: kamailio-snmpstats-modules Architecture: any Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), snmpd +Replaces: kamailio-snmpstats-module Description: SNMP AgentX subagent module for Kamailio Kamailio is a very fast and flexible SIP (RFC3261) proxy server. Written entirely in C, Kamailio can handle thousands calls @@ -133,6 +139,7 @@ Description: SNMP AgentX subagent module for Kamailio Package: kamailio-xmpp-modules Architecture: any Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}) +Replaces: kamailio-xmpp-module Description: XMPP gateway module for Kamailio Kamailio is a very fast and flexible SIP (RFC3261) proxy server. Written entirely in C, Kamailio can handle thousands calls @@ -143,6 +150,7 @@ Description: XMPP gateway module for Kamailio Package: kamailio-carrierroute-modules Architecture: any Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}) +Replaces: kamailio-carrierroute-module Description: Carrierroute module for Kamailio Kamailio is a very fast and flexible SIP (RFC3261) proxy server. Written entirely in C, Kamailio can handle thousands calls @@ -154,6 +162,7 @@ Description: Carrierroute module for Kamailio Package: kamailio-berkeley-modules Architecture: any Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}), db4.6-util +Replaces: kamailio-berkeley-module Description: Berkeley Database module for Kamailio Kamailio is a very fast and flexible SIP (RFC3261) proxy server. Written entirely in C, Kamailio can handle thousands calls @@ -178,6 +187,7 @@ Description: LDAP modules for Kamailio Package: kamailio-utils-modules Architecture: any Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}) +Replaces: kamailio-utils-module Description: Provides a set utility functions for Kamailio Kamailio is a very fast and flexible SIP (RFC3261) proxy server. Written entirely in C, Kamailio can handle thousands calls @@ -189,6 +199,7 @@ Description: Provides a set utility functions for Kamailio Package: kamailio-purple-modules Architecture: any Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}) +Replaces: kamailio-purple-module Description: Provides the purple module, a multi-protocol IM gateway Kamailio is a very fast and flexible SIP (RFC3261) proxy server. Written entirely in C, Kamailio can handle thousands calls @@ -200,6 +211,7 @@ Description: Provides the purple module, a multi-protocol IM gateway Package: kamailio-memcached-modules Architecture: any Depends: ${shlibs:Depends}, kamailio (= ${binary:Version}) +Replaces: kamailio-memcached-module Description: Provides the memcached module, an interface to the memcached server Kamailio is a very fast and flexible SIP (RFC3261) proxy server. Written entirely in C, Kamailio can handle thousands calls

14 years, 5 months

[tracker] Task opened: Debian build of berkeley module fails on debian etch

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Jon Bonilla (manwe) Attached to Project - sip-router Summary - Debian build of berkeley module fails on debian etch Task Type - Bug Report Category - Module Status - Unconfirmed Assigned To - Operating System - Linux Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Tested Kamailio 3.0 branch Debian build of berkeley module fails on debian etch bdb_res.c: In function ‘bdb_res_free’: bdb_res.c:49: error: ‘DBC’ has no member named ‘close’ make[3]: *** [bdb_res.o] Error 1 make[3]: se sale del directorio `/usr/src/kamailio/modules/db_berkeley' make[2]: *** [modules] Error 1 More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=76 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

14 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2010