Merge branch 'master' into lqc-trunk
authorLukasz <lreqc@debian.(none)>
Tue, 27 Oct 2009 11:54:02 +0000 (07:54 -0400)
committerLukasz <lreqc@debian.(none)>
Tue, 27 Oct 2009 11:54:02 +0000 (07:54 -0400)

Trivial merge