Merge commit 'origin/master' into dbus

Conflicts: .gitignore src/Makefile.am src/managerimpl.cpp

Merge commit 'origin/master' into dbus
Conflicts: .gitignore src/Makefile.am src/managerimpl.cpp
fb081475 · Pierre-Luc Beaudoin · 96868436 · 4be69b42 · fb081475 · fb081475
Commit fb081475 authored Sep 07, 2007 by Pierre-Luc Beaudoin
--- a/www/images/fetch.png
+++ b/www/images/fetch.png
--- a/www/images/info.png
+++ b/www/images/info.png
--- a/www/images/logoSFLphone312x91.png
+++ b/www/images/logoSFLphone312x91.png
--- a/www/images/logoSFLphone512x149.png
+++ b/www/images/logoSFLphone512x149.png
--- a/www/index.php
+++ b/www/index.php
--- a/www/sflphone.css
+++ b/www/sflphone.css
--- a/www/sflphone.funcs.php
+++ b/www/sflphone.funcs.php
--- a/www/templates/page_build.php
+++ b/www/templates/page_build.php
--- a/www/templates/page_devel.php
+++ b/www/templates/page_devel.php
--- a/www/templates/page_download.php
+++ b/www/templates/page_download.php
--- a/www/templates/page_features.php
+++ b/www/templates/page_features.php
--- a/www/templates/page_goals.php
+++ b/www/templates/page_goals.php
--- a/www/templates/page_home.php
+++ b/www/templates/page_home.php
--- a/www/templates/page_screenshots.php
+++ b/www/templates/page_screenshots.php