merged with trunk
authorHusen Daudi <hda@hda-laptop>
Tue, 19 Apr 2011 05:57:09 +0000 (11:27 +0530)
committerHusen Daudi <hda@hda-laptop>
Tue, 19 Apr 2011 05:57:09 +0000 (11:27 +0530)
bzr revid: hda@hda-laptop-20110419055709-2idc4o06yjywt6ll


Trivial merge