Merge branch 'master' into m_savard

configure.ac

@@ -150,6 +150,12 @@ if test "x${have_libpj}" = "xfalse" ; then
 fi
 AC_SUBST(SIP_CFLAGS)
 
+dnl Check for uuid development package - name: uuid-dev 
+UUID_MIN_VERSION=1.0
+PKG_CHECK_MODULES(UUID, uuid >= ${UUID_MIN_VERSION})
+AC_SUBST(UUID_CFLAGS)
+AC_SUBST(UUID_LIBS)
+
 dnl Check for alsa development package - name: libasound2-dev 
 LIBASOUND2_MIN_VERSION=1.0
 PKG_CHECK_MODULES(ALSA, alsa >= ${LIBASOUND2_MIN_VERSION})

www/include/footer.php

@@ -25,9 +25,9 @@
                                         
                                     <div class="footBlock">
                                         <ul>
-                                        <li>Development team</li>
+                                        <li>Technical support</li>
                                         <li><a href="mailto:sflphone@lists.savoirfairelinux.net">sflphone@lists.savoirfairelinux.net</a></li>
-                                        <li>Support</li>
+                                        <li>Commercial Support</li>
                                         <li><a href="mailto:support@savoirfairelinux.com">support@savoirfairelinux.com</a></li>
                                         <li>General Information</li>
                                         <li><a href="mailto:contact@savoirfairelinux.com">contact@savoirfairelinux.com</a></li>