Merge.
authorJan Beulich <jbeulich@suse.com>
Fri, 13 Sep 2013 12:28:46 +0000 (14:28 +0200)
committerJan Beulich <jbeulich@suse.com>
Fri, 13 Sep 2013 12:28:46 +0000 (14:28 +0200)

Trivial merge