merge of '00eeaaee6f40de3293fc0a633b5d6fac506a7f54'
authorDojii Seketeli <dodji@openedhand.com>
Wed, 9 Jan 2008 21:05:10 +0000 (21:05 +0000)
committerDojii Seketeli <dodji@openedhand.com>
Wed, 9 Jan 2008 21:05:10 +0000 (21:05 +0000)
commit7fbdf8b4dcd7a7a1d596c5c14ac9e2b545b9eff8
treed2eb3057e2efda78c3039754f81f41f7ae38efef
parentfc6f8419e5eed8f16a9fefd193c94c08c26024fd
parent5f85023a55c3e444f6e53dd77de449f8c2f3ef34
Merge ... '00eeaaee6f40de3293fc0a633b5d6fac506a7f54'
     and '4f26e8bbc7aa3ec656f049526069bce37063c326'