am 11d7502b: am 8656145e: Merge "Fix issue #593153: Broadcast time out when sending..." into froyo

Merge commit '11d7502b35374da12168004e277bcc87f4f7bb50' into kraken

* commit '11d7502b35374da12168004e277bcc87f4f7bb50':
  Fix issue #593153: Broadcast time out when sending...