Merge branch 'oq'
authorMaciej Cencora <m.cencora@gmail.com>
Sat, 15 Aug 2009 23:56:29 +0000 (01:56 +0200)
committerMaciej Cencora <m.cencora@gmail.com>
Sat, 15 Aug 2009 23:56:29 +0000 (01:56 +0200)

Trivial merge