The general rule of Customs & Excise is that a total amount of cannabis (hashish or marijuana) of under 10g (approx 3/8oz) will normally attract an on the spot fine, if it is a first offence and there are no other reasons to detain you. The practice is known as 'compounding', and avoids an appearance in court. Of course, if it happens once, you are likely to get pulled again, and again etc.
This is for the UK, and i know that you are not bringing any! but my point is, if this is what you get for 10g's then you cannot see the UK customs being bothered about your bust from back home, as long as bail conditions don't stop you traveling and they didn't alter your passport i don't see anyone looking twice at you, hope not, have a great trip, Arti