merge of 'ab1a06b7453ad48a1ad5b4f9ee053cd6a9e04d28'
authorOvidiu Sas <sip.nslu@gmail.com>
Wed, 16 Jan 2008 14:59:56 +0000 (14:59 +0000)
committerOvidiu Sas <sip.nslu@gmail.com>
Wed, 16 Jan 2008 14:59:56 +0000 (14:59 +0000)
     and 'c794a426d2a55b0c4b5f1f6fee90c8272bd266e9'


Trivial merge