merged with trunk
authorHusen Daudi <hda@hda-laptop>
Fri, 15 Apr 2011 12:22:12 +0000 (17:52 +0530)
committerHusen Daudi <hda@hda-laptop>
Fri, 15 Apr 2011 12:22:12 +0000 (17:52 +0530)
bzr revid: hda@hda-laptop-20110415122212-ltm9ay1t95pdtct7


Trivial merge