merge of '759e78a6743866bb0cd9004d9e947af20218aaf6'
authorOvidiu Sas <sip.nslu@gmail.com>
Wed, 16 Jan 2008 15:37:45 +0000 (15:37 +0000)
committerOvidiu Sas <sip.nslu@gmail.com>
Wed, 16 Jan 2008 15:37:45 +0000 (15:37 +0000)
commit4a79d9e85757f53b43ac63c36b617b09a5662584
treef4bf057570aa3e02a0c428f1d77b733a5225e346
parent81256a93a0e9bfe7f43bbf1febfddd16e0912ce9
parent1583a7507c224ddefca4c5b2118be14288eb839f
Merge ... '759e78a6743866bb0cd9004d9e947af20218aaf6'
     and 'c7289c9605cd6d73dd8698f9214422a66461880d'