[MERGE]
authorapa-tiny <apa@tinyerp.com>
Wed, 24 Nov 2010 04:41:16 +0000 (10:11 +0530)
committerapa-tiny <apa@tinyerp.com>
Wed, 24 Nov 2010 04:41:16 +0000 (10:11 +0530)
commit076355cc07ad1bd9ded6aab033dfcbcf97f2dde6
treedadfee83d59c5df7871f86cc9560cfb50d56b132
parent4c8a58015ae2edfc87e5e65dce1b651a21e26f1d
parent78ca098cf7fe60dc4b69a20ce0dcdbfd0919a84b
[MERGE]

bzr revid: apa@tinyerp.com-20101124044116-9347i618xj00yumy