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)
     and '4f26e8bbc7aa3ec656f049526069bce37063c326'


Trivial merge