Merge branch 'yun-pjsip' of ssh://milou@192.168.1.203/home/yun/release/sflphone into sip_dev

Conflicts:

	src/sipvoiplink.cpp
	src/useragent.cpp

src/useragent.cpp

@@ -348,7 +348,8 @@ void UserAgent::busy_sleep(unsigned msec)
 #endif
 }
 
-bool UserAgent::addAccount(AccountID id, pjsip_regc **regc2, const std::string& server, const std::string& user, const std::string& passwd, const int& timeout UNUSED, const unsigned int& port) {
+bool UserAgent::addAccount(AccountID id, pjsip_regc **regc2, const std::string& server, const std::string& user, const std::string& passwd, 
+				const int& timeout UNUSED, const unsigned int& port) {
     pj_status_t status;
     AccountID *currentId = new AccountID(id);
     char contactTmp[256];
@@ -389,6 +390,7 @@ bool UserAgent::addAccount(AccountID id, pjsip_regc **regc2, const std::string&
         return status;
     }
 
+
     account = dynamic_cast<SIPAccount *> (Manager::instance().getAccount(id));
     pjsip_cred_info *cred = account->getCredInfo();