Merged
authorhusen daudi <hda@hda>
Thu, 30 Jul 2009 10:40:31 +0000 (16:10 +0530)
committerhusen daudi <hda@hda>
Thu, 30 Jul 2009 10:40:31 +0000 (16:10 +0530)
bzr revid: hda@hda-20090730104031-1g901lvg4z64xpp4


Trivial merge