Merge branch 'master' into backbone
authorBartosz Szatkowski <bulislaw@linux.com>
Wed, 4 Aug 2010 07:09:00 +0000 (09:09 +0200)
committerBartosz Szatkowski <bulislaw@linux.com>
Wed, 4 Aug 2010 07:09:00 +0000 (09:09 +0200)

Trivial merge