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)
commit3e876cbe412792ef85ce8ed72b29130e7d396cf1
tree7fd9f35717656e1c7ed684dd4180da4bb4967dd7
parent79ea22d203a33c048d1a6d1434f9592f6900852d
parentb13686f579217a17eaebeef868d02c02775221a8
Merge ... 'ab1a06b7453ad48a1ad5b4f9ee053cd6a9e04d28'
     and 'c794a426d2a55b0c4b5f1f6fee90c8272bd266e9'