merge of '16c96161b634d2e64b9a1b4ba0e3fff5ddf21bcb'
authorOvidiu Sas <sip.nslu@gmail.com>
Wed, 16 Jan 2008 15:29:38 +0000 (15:29 +0000)
committerOvidiu Sas <sip.nslu@gmail.com>
Wed, 16 Jan 2008 15:29:38 +0000 (15:29 +0000)
commitedfc1860782c39f6507cf68bc63620bf9e0f18f8
tree335c77c782a90ef41411314efc4b2a2788b04f34
parent3cb1f292aa4ddce72f970ef4181ee7057cf3b573
parenta2545abb038db58e661f28328cff70d901d4be59
Merge ... '16c96161b634d2e64b9a1b4ba0e3fff5ddf21bcb'
     and 'c32d254617ffcc037ac8e1b813c7d23979d2cb1c'