merge of 'cb269c669579f2854a506ffe6ac9cb45f2592b25'
authorOvidiu Sas <sip.nslu@gmail.com>
Sun, 13 Jan 2008 16:09:10 +0000 (16:09 +0000)
committerOvidiu Sas <sip.nslu@gmail.com>
Sun, 13 Jan 2008 16:09:10 +0000 (16:09 +0000)
commit79ea22d203a33c048d1a6d1434f9592f6900852d
treedf71080e2e3f5de0ada48bdf90e4d517f5db35f6
parent187b3ea62da133aefa859974a630d9c4fafa930f
parent48af2490ed717ea3f790b4dcda78a8ed3ca96502
Merge ... 'cb269c669579f2854a506ffe6ac9cb45f2592b25'
     and 'ed94d35280e9dbc28ff90a5b175dc47c752bf347'