[Vradi-commits] r22 - trunk